├── .gitignore ├── .idea ├── .name ├── compiler.xml ├── copyright │ └── profiles_settings.xml ├── dictionaries │ └── Edward.xml ├── encodings.xml ├── gradle.xml ├── misc.xml ├── modules.xml ├── runConfigurations.xml └── vcs.xml ├── DEV └── screens │ ├── center_tracker_screenshot.png │ └── screenshot1.png ├── LICENCE.txt ├── README.md ├── app ├── .gitignore ├── build.gradle ├── proguard-rules.pro └── src │ ├── androidTest │ └── java │ │ └── com │ │ └── edwardvanraak │ │ └── materialbarcodescannerexample │ │ └── ApplicationTest.java │ ├── main │ ├── AndroidManifest.xml │ ├── java │ │ └── com │ │ │ └── edwardvanraak │ │ │ └── materialbarcodescannerexample │ │ │ └── MainActivity.java │ └── res │ │ ├── layout │ │ ├── activity_main.xml │ │ └── content_main.xml │ │ ├── menu │ │ └── menu_main.xml │ │ ├── mipmap-hdpi │ │ └── ic_launcher.png │ │ ├── mipmap-mdpi │ │ └── ic_launcher.png │ │ ├── mipmap-xhdpi │ │ └── ic_launcher.png │ │ ├── mipmap-xxhdpi │ │ └── ic_launcher.png │ │ ├── mipmap-xxxhdpi │ │ └── ic_launcher.png │ │ ├── values-v21 │ │ └── styles.xml │ │ ├── values-w820dp │ │ └── dimens.xml │ │ └── values │ │ ├── colors.xml │ │ ├── dimens.xml │ │ ├── strings.xml │ │ └── styles.xml │ └── test │ └── java │ └── com │ └── edwardvanraak │ └── materialbarcodescanner │ └── ExampleUnitTest.java ├── gradle.properties ├── gradle └── wrapper │ ├── gradle-wrapper.jar │ └── gradle-wrapper.properties ├── gradlew ├── gradlew.bat ├── materialbarcodescanner ├── .gitignore ├── build.gradle ├── gradle-jcenter-push.gradle ├── gradle-mvn-push.gradle ├── gradle.properties ├── proguard-rules.pro └── src │ ├── androidTest │ └── java │ │ └── com │ │ └── edwardvanraak │ │ └── materialbarcodescanner │ │ └── ApplicationTest.java │ ├── main │ ├── AndroidManifest.xml │ ├── java │ │ └── com │ │ │ └── edwardvanraak │ │ │ └── materialbarcodescanner │ │ │ ├── BarcodeGraphic.java │ │ │ ├── BarcodeGraphicTracker.java │ │ │ ├── BarcodeTrackerFactory.java │ │ │ ├── CameraSource.java │ │ │ ├── CameraSourcePreview.java │ │ │ ├── GraphicOverlay.java │ │ │ ├── MaterialBarcodeScanner.java │ │ │ ├── MaterialBarcodeScannerActivity.java │ │ │ ├── MaterialBarcodeScannerBuilder.java │ │ │ └── SoundPoolPlayer.java │ └── res │ │ ├── drawable │ │ ├── ic_flash_off_white_24dp.png │ │ ├── ic_flash_on_white_24dp.png │ │ ├── ic_qrcode.png │ │ ├── material_barcode_square_512.png │ │ └── material_barcode_square_512_green.png │ │ ├── layout-land │ │ └── barcode_capture.xml │ │ ├── layout │ │ ├── actions_main.xml │ │ └── barcode_capture.xml │ │ ├── raw │ │ └── bleep.wav │ │ └── values │ │ ├── colors.xml │ │ ├── strings.xml │ │ └── styles.xml │ └── test │ └── java │ └── com │ └── edwardvanraak │ └── materialbarcodescanner │ └── ExampleUnitTest.java └── settings.gradle /.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.gitignore -------------------------------------------------------------------------------- /.idea/.name: -------------------------------------------------------------------------------- 1 | MaterialBarcodeScanner -------------------------------------------------------------------------------- /.idea/compiler.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/compiler.xml -------------------------------------------------------------------------------- /.idea/copyright/profiles_settings.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/copyright/profiles_settings.xml -------------------------------------------------------------------------------- /.idea/dictionaries/Edward.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/dictionaries/Edward.xml -------------------------------------------------------------------------------- /.idea/encodings.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/encodings.xml -------------------------------------------------------------------------------- /.idea/gradle.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/gradle.xml -------------------------------------------------------------------------------- /.idea/misc.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/misc.xml -------------------------------------------------------------------------------- /.idea/modules.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/modules.xml -------------------------------------------------------------------------------- /.idea/runConfigurations.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/runConfigurations.xml -------------------------------------------------------------------------------- /.idea/vcs.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/.idea/vcs.xml -------------------------------------------------------------------------------- /DEV/screens/center_tracker_screenshot.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/DEV/screens/center_tracker_screenshot.png -------------------------------------------------------------------------------- /DEV/screens/screenshot1.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/DEV/screens/screenshot1.png -------------------------------------------------------------------------------- /LICENCE.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/LICENCE.txt -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/README.md -------------------------------------------------------------------------------- /app/.gitignore: -------------------------------------------------------------------------------- 1 | /build 2 | -------------------------------------------------------------------------------- /app/build.gradle: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/build.gradle -------------------------------------------------------------------------------- /app/proguard-rules.pro: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/proguard-rules.pro -------------------------------------------------------------------------------- /app/src/androidTest/java/com/edwardvanraak/materialbarcodescannerexample/ApplicationTest.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/androidTest/java/com/edwardvanraak/materialbarcodescannerexample/ApplicationTest.java -------------------------------------------------------------------------------- /app/src/main/AndroidManifest.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/AndroidManifest.xml -------------------------------------------------------------------------------- /app/src/main/java/com/edwardvanraak/materialbarcodescannerexample/MainActivity.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/java/com/edwardvanraak/materialbarcodescannerexample/MainActivity.java -------------------------------------------------------------------------------- /app/src/main/res/layout/activity_main.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/layout/activity_main.xml -------------------------------------------------------------------------------- /app/src/main/res/layout/content_main.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/layout/content_main.xml -------------------------------------------------------------------------------- /app/src/main/res/menu/menu_main.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/menu/menu_main.xml -------------------------------------------------------------------------------- /app/src/main/res/mipmap-hdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/mipmap-hdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-mdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/mipmap-mdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/mipmap-xhdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxxhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/values-v21/styles.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/values-v21/styles.xml -------------------------------------------------------------------------------- /app/src/main/res/values-w820dp/dimens.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/values-w820dp/dimens.xml -------------------------------------------------------------------------------- /app/src/main/res/values/colors.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/values/colors.xml -------------------------------------------------------------------------------- /app/src/main/res/values/dimens.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/values/dimens.xml -------------------------------------------------------------------------------- /app/src/main/res/values/strings.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/values/strings.xml -------------------------------------------------------------------------------- /app/src/main/res/values/styles.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/main/res/values/styles.xml -------------------------------------------------------------------------------- /app/src/test/java/com/edwardvanraak/materialbarcodescanner/ExampleUnitTest.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/app/src/test/java/com/edwardvanraak/materialbarcodescanner/ExampleUnitTest.java -------------------------------------------------------------------------------- /gradle.properties: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/gradle.properties -------------------------------------------------------------------------------- /gradle/wrapper/gradle-wrapper.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/gradle/wrapper/gradle-wrapper.jar -------------------------------------------------------------------------------- /gradle/wrapper/gradle-wrapper.properties: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/gradle/wrapper/gradle-wrapper.properties -------------------------------------------------------------------------------- /gradlew: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/gradlew -------------------------------------------------------------------------------- /gradlew.bat: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/gradlew.bat -------------------------------------------------------------------------------- /materialbarcodescanner/.gitignore: -------------------------------------------------------------------------------- 1 | /build 2 | -------------------------------------------------------------------------------- /materialbarcodescanner/build.gradle: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/build.gradle -------------------------------------------------------------------------------- /materialbarcodescanner/gradle-jcenter-push.gradle: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/gradle-jcenter-push.gradle -------------------------------------------------------------------------------- /materialbarcodescanner/gradle-mvn-push.gradle: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/gradle-mvn-push.gradle -------------------------------------------------------------------------------- /materialbarcodescanner/gradle.properties: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/gradle.properties -------------------------------------------------------------------------------- /materialbarcodescanner/proguard-rules.pro: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/proguard-rules.pro -------------------------------------------------------------------------------- /materialbarcodescanner/src/androidTest/java/com/edwardvanraak/materialbarcodescanner/ApplicationTest.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/androidTest/java/com/edwardvanraak/materialbarcodescanner/ApplicationTest.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/AndroidManifest.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/AndroidManifest.xml -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/BarcodeGraphic.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/BarcodeGraphic.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/BarcodeGraphicTracker.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/BarcodeGraphicTracker.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/BarcodeTrackerFactory.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/BarcodeTrackerFactory.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/CameraSource.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/CameraSource.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/CameraSourcePreview.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/CameraSourcePreview.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/GraphicOverlay.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/GraphicOverlay.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScanner.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScanner.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerActivity.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerActivity.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerBuilder.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerBuilder.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/SoundPoolPlayer.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/SoundPoolPlayer.java -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/drawable/ic_flash_off_white_24dp.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/drawable/ic_flash_off_white_24dp.png -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/drawable/ic_flash_on_white_24dp.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/drawable/ic_flash_on_white_24dp.png -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/drawable/ic_qrcode.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/drawable/ic_qrcode.png -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/drawable/material_barcode_square_512.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/drawable/material_barcode_square_512.png -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/drawable/material_barcode_square_512_green.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/drawable/material_barcode_square_512_green.png -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/layout-land/barcode_capture.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/layout-land/barcode_capture.xml -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/layout/actions_main.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/layout/actions_main.xml -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/layout/barcode_capture.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/layout/barcode_capture.xml -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/raw/bleep.wav: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/raw/bleep.wav -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/values/colors.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/values/colors.xml -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/values/strings.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/values/strings.xml -------------------------------------------------------------------------------- /materialbarcodescanner/src/main/res/values/styles.xml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/main/res/values/styles.xml -------------------------------------------------------------------------------- /materialbarcodescanner/src/test/java/com/edwardvanraak/materialbarcodescanner/ExampleUnitTest.java: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/EdwardvanRaak/MaterialBarcodeScanner/HEAD/materialbarcodescanner/src/test/java/com/edwardvanraak/materialbarcodescanner/ExampleUnitTest.java -------------------------------------------------------------------------------- /settings.gradle: -------------------------------------------------------------------------------- 1 | include ':app', ':materialbarcodescanner' 2 | --------------------------------------------------------------------------------