Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions library-no-op/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ android {

defaultConfig {
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
}

lintOptions {
Expand Down
1 change: 1 addition & 0 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ android {

defaultConfig {
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
consumerProguardFiles 'proguard-rules.pro'
resValue("string", "chucker_version", "$VERSION_NAME")
}
Expand Down
2 changes: 2 additions & 0 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@
<application>
<activity
android:name="com.chuckerteam.chucker.internal.ui.MainActivity"
android:exported="false"
android:label="@string/chucker_name"
android:launchMode="singleTask"
android:taskAffinity="com.chuckerteam.chucker.task"
android:theme="@style/Chucker.Theme" />

<activity
android:name="com.chuckerteam.chucker.internal.ui.transaction.TransactionActivity"
android:exported="false"
android:parentActivityName="com.chuckerteam.chucker.internal.ui.MainActivity"
android:theme="@style/Chucker.Theme" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,25 @@ internal sealed class TransactionPayloadViewHolder(view: View) : RecyclerView.Vi
override fun bind(item: TransactionPayloadItem) {
if (item is TransactionPayloadItem.HeaderItem) {
headerBinding.responseHeaders.text = item.headers
headerBinding.headersContainer.setOnClickListener {
toggleHeaders()
}
}
}

private fun toggleHeaders() {
val isVisible = headerBinding.responseHeaders.visibility == View.VISIBLE
headerBinding.responseHeaders.visibility = if (isVisible) View.GONE else View.VISIBLE
headerBinding.headersArrow.rotation = if (isVisible) ARROW_ROTATION_COLLAPSED else ARROW_ROTATION_EXPANDED
headerBinding.headersArrow.contentDescription = headerBinding.root.context.getString(
if (isVisible) R.string.chucker_expand_headers else R.string.chucker_collapse_headers
)
}

private companion object {
const val ARROW_ROTATION_EXPANDED = 0f
const val ARROW_ROTATION_COLLAPSED = -90f
}
}

internal class BodyLineViewHolder(
Expand Down
11 changes: 11 additions & 0 deletions library/src/main/res/drawable/chucker_arrow.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?android:attr/textColorPrimary">
<path
android:fillColor="@android:color/white"
android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" />
</vector>
42 changes: 38 additions & 4 deletions library/src/main/res/layout/chucker_transaction_item_headers.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/responseHeaders"
android:id="@+id/headersContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/chucker_doub_grid"
android:textIsSelectable="true"
tools:text="Content-Type: application/json" />
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:paddingVertical="@dimen/chucker_half_grid">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<TextView
android:id="@+id/headersLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/chucker_headers"
android:textStyle="bold" />

<ImageView
android:id="@+id/headersArrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/chucker_collapse_headers"
android:src="@drawable/chucker_arrow" />

</LinearLayout>

<TextView
android:id="@+id/responseHeaders"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textIsSelectable="true"
tools:text="Content-Type: application/json" />

</LinearLayout>
3 changes: 3 additions & 0 deletions library/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,7 @@
<string name="chucker_request_is_empty">This request is empty</string>
<string name="chucker_response_is_empty">This response is empty</string>
<string name="chucker_shortcut_label">Open Chucker</string>
<string name="chucker_headers">Headers</string>
<string name="chucker_expand_headers">Expand headers</string>
<string name="chucker_collapse_headers">Collapse headers</string>
</resources>
2 changes: 1 addition & 1 deletion pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
echo "Running pre-commit checks..."

OUTPUT="/tmp/analysis-result"
./gradlew detekt ktlintCheck > ${OUTPUT}
./gradlew detekt ktlintCheck apiCheck > ${OUTPUT}
EXIT_CODE=$?
if [ ${EXIT_CODE} -ne 0 ]; then
cat ${OUTPUT}
Expand Down
Loading