-
-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into main
- Loading branch information
Showing
27 changed files
with
633 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
app/src/main/java/eu/darken/octi/modules/clipboard/ClipboardVH.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package eu.darken.octi.modules.clipboard | ||
|
|
||
| import android.view.ViewGroup | ||
| import android.widget.Toast | ||
| import androidx.core.view.isGone | ||
| import eu.darken.octi.R | ||
| import eu.darken.octi.databinding.DashboardDeviceClipboardItemBinding | ||
| import eu.darken.octi.main.ui.dashboard.items.perdevice.PerDeviceModuleAdapter | ||
| import eu.darken.octi.module.core.ModuleData | ||
|
|
||
|
|
||
| class ClipboardVH(parent: ViewGroup) : | ||
| PerDeviceModuleAdapter.BaseVH<ClipboardVH.Item, DashboardDeviceClipboardItemBinding>( | ||
| R.layout.dashboard_device_clipboard_item, | ||
| parent | ||
| ) { | ||
|
|
||
| override val viewBinding = lazy { DashboardDeviceClipboardItemBinding.bind(itemView) } | ||
|
|
||
| override val onBindData: DashboardDeviceClipboardItemBinding.( | ||
| item: Item, | ||
| payloads: List<Any> | ||
| ) -> Unit = { item, _ -> | ||
| val clip = item.data.data | ||
|
|
||
| secondary.text = when (clip.type) { | ||
| ClipboardInfo.Type.EMPTY -> getString(R.string.general_empty_label) | ||
| ClipboardInfo.Type.SIMPLE_TEXT -> clip.data.utf8() | ||
| else -> clip.data.toString() | ||
| }.let { "\"$it\"" } | ||
|
|
||
| pasteAction.apply { | ||
| setOnClickListener { | ||
| item.onPasteClicked?.invoke() | ||
| Toast.makeText(context, R.string.module_clipboard_copied_os_to_octi, Toast.LENGTH_SHORT).show() | ||
| } | ||
| setOnLongClickListener { | ||
| item.onClearClicked() | ||
| true | ||
| } | ||
| isGone = item.onPasteClicked == null | ||
| } | ||
|
|
||
| copyAction.setOnClickListener { | ||
| it.requestFocus() | ||
| item.onCopyClicked(clip) | ||
| Toast.makeText(context, R.string.module_clipboard_copied_octi_to_os, Toast.LENGTH_SHORT).show() | ||
| } | ||
| } | ||
|
|
||
| data class Item( | ||
| val data: ModuleData<ClipboardInfo>, | ||
| val isOurDevice: Boolean, | ||
| val onClearClicked: (() -> Unit), | ||
| val onPasteClicked: (() -> Unit)?, | ||
| val onCopyClicked: ((ClipboardInfo) -> Unit), | ||
| ) : PerDeviceModuleAdapter.Item { | ||
| override val stableId: Long = data.moduleId.hashCode().toLong() | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:tint="?attr/colorControlNormal" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z" /> | ||
| </vector> |
10 changes: 10 additions & 0 deletions
10
app/src/main/res/drawable/ic_baseline_content_paste_24.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:tint="?attr/colorControlNormal" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z" /> | ||
| </vector> |
13 changes: 13 additions & 0 deletions
13
app/src/main/res/drawable/ic_baseline_content_paste_go_24.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:tint="?attr/colorControlNormal" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M5,5h2v3h10V5h2v6h2V5c0,-1.1 -0.9,-2 -2,-2h-4.18C14.4,1.84 13.3,1 12,1S9.6,1.84 9.18,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h5v-2H5V5zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1s-1,-0.45 -1,-1S11.45,3 12,3z" /> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M18.01,13l-1.42,1.41l1.58,1.58l-6.17,0l0,2l6.17,0l-1.58,1.59l1.42,1.41l3.99,-4z" /> | ||
| </vector> |
74 changes: 74 additions & 0 deletions
74
app/src/main/res/layout/dashboard_device_clipboard_item.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| style="@style/DashboardDeviceInfoRow" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:background="?selectableItemBackground"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/icon" | ||
| android:layout_width="20dp" | ||
| android:layout_height="20dp" | ||
| android:src="@drawable/ic_baseline_content_paste_24" | ||
| app:layout_constraintBottom_toBottomOf="@id/secondary" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="@id/primary" | ||
| tools:ignore="ContentDescription" /> | ||
|
|
||
| <com.google.android.material.textview.MaterialTextView | ||
| android:id="@+id/primary" | ||
| style="@style/TextAppearance.Material3.BodyMedium" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="8dp" | ||
| android:singleLine="true" | ||
| android:text="@string/module_clipboard_label" | ||
| app:layout_constraintBottom_toTopOf="@id/secondary" | ||
| app:layout_constraintEnd_toStartOf="@id/paste_action" | ||
| app:layout_constraintStart_toEndOf="@id/icon" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| tools:text="Clipboard" /> | ||
|
|
||
| <com.google.android.material.textview.MaterialTextView | ||
| android:id="@+id/secondary" | ||
| style="@style/TextAppearance.Material3.BodySmall" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:singleLine="true" | ||
| android:text="@string/general_empty_label" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toStartOf="@id/paste_action" | ||
| app:layout_constraintStart_toStartOf="@id/primary" | ||
| app:layout_constraintTop_toBottomOf="@id/primary" /> | ||
|
|
||
| <com.google.android.material.button.MaterialButton | ||
| android:id="@+id/paste_action" | ||
| style="@style/Widget.Material3.Button" | ||
| android:layout_width="48dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="8dp" | ||
| app:icon="@drawable/ic_baseline_content_paste_go_24" | ||
| app:iconGravity="textStart" | ||
| app:iconPadding="0dp" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toStartOf="@id/copy_action" | ||
| app:layout_constraintStart_toEndOf="@id/secondary" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| <com.google.android.material.button.MaterialButton | ||
| android:id="@+id/copy_action" | ||
| style="@style/Widget.Material3.Button" | ||
| android:layout_width="48dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="8dp" | ||
| app:icon="@drawable/ic_baseline_content_copy_24" | ||
| app:iconGravity="textStart" | ||
| app:iconPadding="0dp" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toEndOf="@id/paste_action" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| plugins { | ||
| id("com.android.library") | ||
| id("org.jetbrains.kotlin.android") | ||
| id("kotlin-android") | ||
| id("kotlin-kapt") | ||
| id("kotlin-parcelize") | ||
| } | ||
|
|
||
| apply(plugin = "dagger.hilt.android.plugin") | ||
|
|
||
| android { | ||
| namespace = "eu.darken.octi.modules.clipboard" | ||
| compileSdk = ProjectConfig.compileSdk | ||
|
|
||
| defaultConfig { | ||
| minSdk = ProjectConfig.minSdk | ||
| targetSdk = ProjectConfig.targetSdk | ||
| } | ||
|
|
||
| setupModuleBuildTypes() | ||
|
|
||
| setupCompileOptions() | ||
|
|
||
| setupKotlinOptions() | ||
|
|
||
| testOptions { | ||
| unitTests { | ||
| isIncludeAndroidResources = true | ||
| } | ||
| tasks.withType<Test> { | ||
| useJUnitPlatform() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:${Versions.Desugar.core}") | ||
|
|
||
| implementation(project(":app-common")) | ||
| testImplementation(project(":app-common-test")) | ||
| implementation(project(":module-core")) | ||
| implementation(project(":sync-core")) | ||
|
|
||
| addAndroidCore() | ||
| addDI() | ||
| addCoroutines() | ||
| addSerialization() | ||
| addIO() | ||
| addTesting() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # Add project specific ProGuard rules here. | ||
| # You can control the set of applied configuration files using the | ||
| # proguardFiles setting in build.gradle. | ||
| # | ||
| # For more details, see | ||
| # http://developer.android.com/guide/developing/tools/proguard.html | ||
|
|
||
| # If your project uses WebView with JS, uncomment the following | ||
| # and specify the fully qualified class name to the JavaScript interface | ||
| # class: | ||
| #-keepclassmembers class fqcn.of.javascript.interface.for.webview { | ||
| # public *; | ||
| #} | ||
|
|
||
| # Uncomment this to preserve the line number information for | ||
| # debugging stack traces. | ||
| #-keepattributes SourceFile,LineNumberTable | ||
|
|
||
| # If you keep the line number information, uncomment this to | ||
| # hide the original source file name. | ||
| #-renamesourcefileattribute SourceFile |
Oops, something went wrong.