Merge pull request chenxiaolong#979 from chenxiaolong/arch-components

Initial direct Kotlin port and refactor patcher options dialog for MVVM

Author: chenxiaolong

Android_GUI/build.gradle.in

@@ -1,14 +1,18 @@
 buildscript {
+    ext.kotlin_version = '1.2.20'
+
     repositories {
         jcenter()
         google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 repositories {
     jcenter()
@@ -138,6 +142,11 @@ readSigningConfig('@_DEBUG_SIGN_CONFIG_PATH@', android.signingConfigs.debug)
 readSigningConfig('@_CI_SIGN_CONFIG_PATH@', android.signingConfigs.ci)
 
 dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation "android.arch.lifecycle:extensions:1.0.0"
+    annotationProcessor "android.arch.lifecycle:compiler:1.0.0"
+
     implementation 'com.android.support:support-v4:27.0.2'
     implementation 'com.android.support:appcompat-v7:27.0.2'
     implementation 'com.android.support:cardview-v7:27.0.2'

Android_GUI/res/layout/dialog_patcher_opts.xml

@@ -42,7 +42,7 @@
         android:text="@string/patcher_partconfig_title" />
 
     <android.support.v7.widget.AppCompatSpinner
-        android:id="@+id/spinner_rom_id"
+        android:id="@+id/spinner_location"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/card_v7_normal_view_margin_top" />
@@ -58,7 +58,7 @@
         android:orientation="horizontal" />
 
     <android.support.v7.widget.AppCompatEditText
-        android:id="@+id/rom_id_named_slot_id"
+        android:id="@+id/template_suffix"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/install_location_named_slot_id_hint"
@@ -72,7 +72,7 @@
         android:text="@string/patcher_partconfig_desc_title" />
 
     <TextView
-        android:id="@+id/rom_id_desc"
+        android:id="@+id/location_desc"
         style="@style/card_v7_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

Android_GUI/src/com/github/chenxiaolong/dualbootpatcher/AboutFragment.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2014-2015  Andrew Gunnerson <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.github.chenxiaolong.dualbootpatcher
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.text.Html
+import android.text.method.LinkMovementMethod
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+
+class AboutFragment : Fragment() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_about, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        val name: TextView = activity!!.findViewById(R.id.about_name)
+        name.setText(BuildConfig.APP_NAME_RESOURCE)
+
+        val version: TextView = activity!!.findViewById(R.id.about_version)
+        version.text = String.format(getString(R.string.version), BuildConfig.VERSION_NAME)
+
+        val credits: TextView = activity!!.findViewById(R.id.about_credits)
+
+        val linkable = "<a href=\"%s\">%s</a>\n"
+        val newline = "<br />"
+        val separator = " | "
+
+        val creditsText = getString(R.string.credits)
+        val sourceCode = String.format(linkable,
+                getString(R.string.url_source_code),
+                getString(R.string.link_source_code))
+        val xdaThread = String.format(linkable,
+                getString(R.string.url_xda_thread),
+                getString(R.string.link_xda_thread))
+        val licenses = String.format(linkable,
+                getString(R.string.url_licenses),
+                getString(R.string.link_licenses))
+
+        credits.text = Html.fromHtml(creditsText + newline + newline
+                + sourceCode + separator + xdaThread + separator + licenses)
+        credits.movementMethod = LinkMovementMethod.getInstance()
+    }
+
+    companion object {
+        val FRAGMENT_TAG: String = AboutFragment::class.java.canonicalName
+
+        fun newInstance(): AboutFragment {
+            return AboutFragment()
+        }
+    }
+}