Revisioned view API

Author: macuser

codeview/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -25,8 +25,8 @@ android {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile 'com.android.support:recyclerview-v7:24.2.0'
+    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:recyclerview-v7:25.0.1'
 }
 repositories {
     mavenCentral()

codeview/src/main/assets/training-set/javascript/new 3.txt

@@ -67,32 +67,32 @@ var minExpectedLifetime = '20s';
  * @api public
  */
 
-function UpServer (server, file, opts) {
-  if (this == global) return new UpServer(server, file, opts);
+function UpServer (server, file, options) {
+  if (this == global) return new UpServer(server, file, options);
 
   Distributor.call(this, server);
 
   var self = this;
-  opts = opts || {};
+  options = options || {};
 
   this.file = file;
-  this.numWorkers = eq(opts.numWorkers || numWorkers, { cpus: cpus });
-  this.workerTimeout = ms(null != opts.workerTimeout
-    ? opts.workerTimeout : workerTimeout);
-  this.requires = opts.requires || [];
-  this.assumeReady = opts.assumeReady === undefined ? true : !!opts.assumeReady;
-  this.keepAlive = opts.keepAlive || false;
-  this.minExpectedLifetime = ms(opts.minExpectedLifetime != null ? opts.minExpectedLifetime : minExpectedLifetime);
-  if (false !== opts.workerPingInterval) {
-    this.workerPingInterval = ms(opts.workerPingInterval || '1m');
+  this.numWorkers = eq(options.numWorkers || numWorkers, { cpus: cpus });
+  this.workerTimeout = ms(null != options.workerTimeout
+    ? options.workerTimeout : workerTimeout);
+  this.requires = options.requires || [];
+  this.assumeReady = options.assumeReady === undefined ? true : !!options.assumeReady;
+  this.keepAlive = options.keepAlive || false;
+  this.minExpectedLifetime = ms(options.minExpectedLifetime != null ? options.minExpectedLifetime : minExpectedLifetime);
+  if (false !== options.workerPingInterval) {
+    this.workerPingInterval = ms(options.workerPingInterval || '1m');
   }
 
   this.workers = [];
   this.spawning = [];
   this.lastIndex = -1;
 
-  if (opts.title) {
-    this.title = opts.title;
+  if (options.title) {
+    this.title = options.title;
     process.title = this.title + ' master';
   }
 
@@ -290,15 +290,15 @@ function Worker (server) {
   this.server = server;
   this.readyState = 'spawning';
 
-  var opts = JSON.stringify({
+  var options = JSON.stringify({
       file: server.file
     , requires: server.requires
     , assumeReady: server.assumeReady
     , pingInterval: server.workerPingInterval
     , title: server.title
   });
 
-  this.proc = fork(__dirname + '/worker.js', [opts], { env: process.env });
+  this.proc = fork(__dirname + '/worker.js', [options], { env: process.env });
   this.proc.on('message', this.onMessage.bind(this));
   this.proc.on('exit', this.onExit.bind(this));
   this.pid = this.proc.pid;

codeview/src/main/java/io/github/kbiakov/codeview/CodeView.kt

@@ -59,13 +59,8 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
     }
 
     /**
-     * Code adapter accessor.
-     */
-    private fun getAdapter() = vCodeList.adapter as? AbstractCodeAdapter<*>
-
-    /**
-     * Highlight code by defined programming language.
-     * It holds the placeholder on the view until code is not highlighted.
+     * Highlight code with defined programming language.
+     * It holds the placeholder on view until code is not highlighted.
      */
     private fun highlight() {
         getAdapter()?.highlight {
@@ -97,51 +92,95 @@ class CodeView(context: Context, attrs: AttributeSet) : RelativeLayout(context,
     /**
      * Prepare view with default adapter & options.
      */
-    private fun prepare() {
-        setAdapter(CodeWithNotesAdapter(context))
-    }
+    private fun prepare() = setAdapter(CodeWithNotesAdapter(context))
+
+    /**
+     * View options accessor.
+     */
+    fun getOptions(): Options? = getAdapter()?.options
 
     /**
      * Initialize with options.
      *
-     * @param opts Options
+     * @param options Options
+     */
+    fun setOptions(options: Options) = setOptions(options, false)
+
+    /**
+     * Set options & initialize if needed.
+     *
+     * @param options Options
+     * @param isSaveAdapter Save adapter?
      */
-    fun setOptions(opts: Options) {
-        setAdapter(CodeWithNotesAdapter(context, opts))
+    fun setOptions(options: Options, isSaveAdapter: Boolean = true) {
+        setAdapter(if (isSaveAdapter)
+            getAdapter() ?: CodeWithNotesAdapter(context, options)
+        else
+            CodeWithNotesAdapter(context, options))
     }
 
+    /**
+     * Code adapter accessor.
+     */
+    fun getAdapter() = vCodeList.adapter as? AbstractCodeAdapter<*>
+
     /**
      * Initialize with adapter.
      *
      * @param adapter Adapter
      */
-    fun setAdapter(adapter: AbstractCodeAdapter<*>) {
+    fun setAdapter(adapter: AbstractCodeAdapter<*>) = setAdapter(adapter, false)
+
+    /**
+     * Set adapter & initialize if needed.
+     *
+     * @param adapter Adapter
+     * @param isSaveOptions Save options?
+     */
+    fun setAdapter(adapter: AbstractCodeAdapter<*>, isSaveOptions: Boolean = true) {
+        if (isSaveOptions)
+            adapter.options = getOptions() ?: Options(context)
+
         vCodeList.adapter = adapter
-        setupShadows(adapter.opts.shadows)
+        setupShadows(adapter.options.shadows)
         highlight()
     }
 
     /**
      * Set code content.
-     * At this point view should be prepared, otherwise it
-     * will be configured automatically with default params.
+     *
+     * There are two ways before code will be highlighted:
+     * 1) view is not initialized (adapter or options are not set),
+     *    prepare with default params & try to classify language
+     * 2) view initialized with some params, language:
+     *    a) is set: used defined programming language
+     *    b) not set: try to classify
      *
      * @param code Code content
      */
     fun setCode(code: String) {
         getAdapter() ?: prepare()
-        getAdapter()?.updateCode(code)
+        getAdapter()!!.updateCode(code)
     }
 
     /**
      * Set code content.
      *
+     * There are two ways before code will be highlighted:
+     * 1) view is not initialized, prepare with default params
+     * 2) view initialized with some params, set new language
+     *
      * @param code Code content
      * @param language Programming language
      */
     fun setCode(code: String, language: String) {
-        getAdapter() ?: setOptions(Options(context, language = language))
-        getAdapter()?.updateCode(code)
+        val options = if (getAdapter() == null)
+            Options(context)
+        else
+            getAdapter()!!.options
+
+        setOptions(options.withLanguage(language))
+        getAdapter()!!.updateCode(code)
     }
 }