diff --git a/build.gradle b/build.gradle index b55931d..687af5c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { versionsPlugin : '0.21.0', hyperion : '0.9.27', debugDb : '1.0.6', - chuck : '1.1.47', + chucker : '3.0.0-alpha2', hyperionAppInfo : '1.1.0', deviceNames : '1.1.9', autoService : '1.0-rc6', @@ -38,6 +38,7 @@ subprojects { subproject -> google() mavenCentral() jcenter() + maven { url 'https://jitpack.io' } } apply plugin: 'com.github.ben-manes.versions' diff --git a/chuck_plugin/build.gradle b/chuck_plugin/build.gradle deleted file mode 100644 index 42569fb..0000000 --- a/chuck_plugin/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -androidPublish.artifactId = "chuck" -description = "Hyperion plugin for menu item with Chuck - simple in-app HTTP inspector. Part of FoQA project." - -dependencies { - implementation "pl.droidsonroids:chuck:$versions.chuck" -} \ No newline at end of file diff --git a/chuck_plugin/src/main/AndroidManifest.xml b/chuck_plugin/src/main/AndroidManifest.xml deleted file mode 100644 index e665f81..0000000 --- a/chuck_plugin/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/chuck_plugin/src/main/java/pl/droidsonroids/foqa/chuck/ChuckPlugin.kt b/chuck_plugin/src/main/java/pl/droidsonroids/foqa/chuck/ChuckPlugin.kt deleted file mode 100644 index d19a1fa..0000000 --- a/chuck_plugin/src/main/java/pl/droidsonroids/foqa/chuck/ChuckPlugin.kt +++ /dev/null @@ -1,27 +0,0 @@ -package pl.droidsonroids.foqa.chuck - -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import com.google.auto.service.AutoService -import com.readystatesoftware.chuck.Chuck -import com.willowtreeapps.hyperion.plugin.v1.Plugin -import com.willowtreeapps.hyperion.plugin.v1.PluginModule - -@AutoService(Plugin::class) -class ChuckPlugin : Plugin() { - override fun createPluginModule(): PluginModule = ChuckModule() -} - -internal class ChuckModule : PluginModule() { - - override fun createPluginView(layoutInflater: LayoutInflater, parent: ViewGroup): View { - val view = layoutInflater.inflate(R.layout.foqa_chuck_menu_item, parent, false) - view.setOnClickListener { - it.context.startActivity(Chuck.getLaunchIntent(it.context)) - } - return view - } - - override fun getName() = R.string.foqa_chuck_plugin_name -} diff --git a/chuck_plugin/.gitignore b/chucker_plugin/.gitignore similarity index 100% rename from chuck_plugin/.gitignore rename to chucker_plugin/.gitignore diff --git a/chucker_plugin/build.gradle b/chucker_plugin/build.gradle new file mode 100644 index 0000000..c73ffb8 --- /dev/null +++ b/chucker_plugin/build.gradle @@ -0,0 +1,6 @@ +androidPublish.artifactId = "chucker" +description = "Hyperion plugin for menu item with Chuckuer - simple in-app HTTP inspector. Part of FoQA project." + +dependencies { + implementation "com.github.ChuckerTeam.Chucker:library:$versions.chucker" +} \ No newline at end of file diff --git a/chucker_plugin/src/main/AndroidManifest.xml b/chucker_plugin/src/main/AndroidManifest.xml new file mode 100644 index 0000000..61b7bbf --- /dev/null +++ b/chucker_plugin/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/chucker_plugin/src/main/java/pl/droidsonroids/foqa/chucker/ChuckerPlugin.kt b/chucker_plugin/src/main/java/pl/droidsonroids/foqa/chucker/ChuckerPlugin.kt new file mode 100644 index 0000000..79bea0d --- /dev/null +++ b/chucker_plugin/src/main/java/pl/droidsonroids/foqa/chucker/ChuckerPlugin.kt @@ -0,0 +1,27 @@ +package pl.droidsonroids.foqa.chucker + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.chuckerteam.chucker.api.Chucker +import com.google.auto.service.AutoService +import com.willowtreeapps.hyperion.plugin.v1.Plugin +import com.willowtreeapps.hyperion.plugin.v1.PluginModule + +@AutoService(Plugin::class) +class ChuckerPlugin : Plugin() { + override fun createPluginModule(): PluginModule = ChuckerModule() +} + +internal class ChuckerModule : PluginModule() { + + override fun createPluginView(layoutInflater: LayoutInflater, parent: ViewGroup): View { + val view = layoutInflater.inflate(R.layout.foqa_chucker_menu_item, parent, false) + view.setOnClickListener { + it.context.startActivity(Chucker.getLaunchIntent(it.context, Chucker.SCREEN_HTTP)) + } + return view + } + + override fun getName() = R.string.foqa_chucker_plugin_name +} diff --git a/chuck_plugin/src/main/res/drawable/foqa_ic_perm_scan_wifi.xml b/chucker_plugin/src/main/res/drawable/foqa_ic_perm_scan_wifi.xml similarity index 100% rename from chuck_plugin/src/main/res/drawable/foqa_ic_perm_scan_wifi.xml rename to chucker_plugin/src/main/res/drawable/foqa_ic_perm_scan_wifi.xml diff --git a/chuck_plugin/src/main/res/layout/foqa_chuck_menu_item.xml b/chucker_plugin/src/main/res/layout/foqa_chucker_menu_item.xml similarity index 92% rename from chuck_plugin/src/main/res/layout/foqa_chuck_menu_item.xml rename to chucker_plugin/src/main/res/layout/foqa_chucker_menu_item.xml index ec63878..a22e1be 100644 --- a/chuck_plugin/src/main/res/layout/foqa_chuck_menu_item.xml +++ b/chucker_plugin/src/main/res/layout/foqa_chucker_menu_item.xml @@ -10,6 +10,6 @@ android:minHeight="131dp" android:orientation="horizontal" android:padding="@dimen/hype_plugin_padding" - android:text="@string/foqa_chuck_plugin_name" + android:text="@string/foqa_chucker_plugin_name" android:textColor="@color/hype_plugin_color_selector" android:textSize="16sp" /> diff --git a/chuck_plugin/src/main/res/values/values.xml b/chucker_plugin/src/main/res/values/values.xml similarity index 50% rename from chuck_plugin/src/main/res/values/values.xml rename to chucker_plugin/src/main/res/values/values.xml index ed6c82b..27535b7 100644 --- a/chuck_plugin/src/main/res/values/values.xml +++ b/chucker_plugin/src/main/res/values/values.xml @@ -1,4 +1,4 @@ - Chuck + Chucker \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index ffad677..c41b027 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -19,5 +19,5 @@ dependencies { implementation project(':device_info_plugin') implementation project(':font_scale_plugin') - implementation project(':chuck_plugin') + implementation project(':chucker_plugin') } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 15e8c27..0e9560f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':library', ':device_info_plugin', ':font_scale_plugin', ':chuck_plugin', ':sample' \ No newline at end of file +include ':library', ':device_info_plugin', ':font_scale_plugin', ':chucker_plugin', ':sample' \ No newline at end of file diff --git a/version.properties b/version.properties index 8cc3cb4..b1c8535 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ #Version of the produced binaries. This file is intended to be checked-in. #It will be automatically bumped by release automation. -version=0.0.22 +version=0.1.0 previousVersion=0.0.21