From 4d44270e8b2ff8c654f84b4ddde64f453f3d6363 Mon Sep 17 00:00:00 2001 From: Bambooin Date: Sun, 1 Sep 2024 22:56:10 +0800 Subject: [PATCH] docs: add SPDX license header with reuse --- app/src/main/java/com/osfans/trime/core/RimeProto.kt | 4 ++++ .../main/java/com/osfans/trime/core/RimeResponse.kt | 4 ++++ .../com/osfans/trime/ime/bar/QuickBarStateMachine.kt | 11 +++++++---- .../osfans/trime/ime/bar/UnrollButtonStateMachine.kt | 1 + .../java/com/osfans/trime/ime/bar/ui/CandidateUi.kt | 4 ++++ .../java/com/osfans/trime/ime/bar/ui/ToolButton.kt | 1 + .../osfans/trime/ime/candidates/CandidateItemUi.kt | 4 ++++ .../trime/ime/candidates/CandidateViewHolder.kt | 4 ++++ .../trime/ime/candidates/CompactCandidateModule.kt | 4 ++++ .../candidates/adapter/CompactCandidateViewAdapter.kt | 4 ++++ .../candidates/adapter/PagingCandidateViewAdapter.kt | 1 + .../ime/candidates/unrolled/CandidatesPagingSource.kt | 1 + .../candidates/unrolled/UnrolledCandidateLayout.kt | 1 + .../decoration/FlexboxHorizontalDecoration.kt | 1 + .../unrolled/window/BaseUnrolledCandidateWindow.kt | 1 + .../unrolled/window/FlexboxUnrolledCandidateWindow.kt | 1 + .../java/com/osfans/trime/util/EventStateMachine.kt | 1 + app/src/main/jni/librime_jni/jni-utils.h | 6 ++++++ app/src/main/jni/librime_jni/objconv.h | 6 ++++++ .../main/res/drawable/ic_baseline_expand_less_24.xml | 6 ++++++ .../main/res/drawable/ic_baseline_expand_more_24.xml | 6 ++++++ app/src/main/res/values/input_view_ids.xml | 7 +++++++ gradle.properties | 4 ++++ 23 files changed, 79 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/osfans/trime/core/RimeProto.kt b/app/src/main/java/com/osfans/trime/core/RimeProto.kt index 60e28305c8..255e418529 100644 --- a/app/src/main/java/com/osfans/trime/core/RimeProto.kt +++ b/app/src/main/java/com/osfans/trime/core/RimeProto.kt @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 Rime community +// +// SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.core class RimeProto { diff --git a/app/src/main/java/com/osfans/trime/core/RimeResponse.kt b/app/src/main/java/com/osfans/trime/core/RimeResponse.kt index d869bd667e..ceba1d2185 100644 --- a/app/src/main/java/com/osfans/trime/core/RimeResponse.kt +++ b/app/src/main/java/com/osfans/trime/core/RimeResponse.kt @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 Rime community +// +// SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.core data class RimeResponse( diff --git a/app/src/main/java/com/osfans/trime/ime/bar/QuickBarStateMachine.kt b/app/src/main/java/com/osfans/trime/ime/bar/QuickBarStateMachine.kt index 43278c2f33..6cd3341e59 100644 --- a/app/src/main/java/com/osfans/trime/ime/bar/QuickBarStateMachine.kt +++ b/app/src/main/java/com/osfans/trime/ime/bar/QuickBarStateMachine.kt @@ -1,7 +1,10 @@ -/* - * SPDX-License-Identifier: LGPL-2.1-or-later - * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors - */ +// Copyright 2021 - 2023 Fcitx5 for Android Contributors +// Copyright 2021-2023 Fcitx5 for Android Contributors +// SPDX-FileCopyrightText: 2024 Rime community +// +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: LGPL-2.1-or-later + package com.osfans.trime.ime.bar import com.osfans.trime.ime.bar.QuickBarStateMachine.BooleanKey.CandidateEmpty diff --git a/app/src/main/java/com/osfans/trime/ime/bar/UnrollButtonStateMachine.kt b/app/src/main/java/com/osfans/trime/ime/bar/UnrollButtonStateMachine.kt index 8f0364f281..3cb260caa4 100644 --- a/app/src/main/java/com/osfans/trime/ime/bar/UnrollButtonStateMachine.kt +++ b/app/src/main/java/com/osfans/trime/ime/bar/UnrollButtonStateMachine.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.bar import com.osfans.trime.ime.bar.UnrollButtonStateMachine.BooleanKey.UnrolledCandidatesEmpty diff --git a/app/src/main/java/com/osfans/trime/ime/bar/ui/CandidateUi.kt b/app/src/main/java/com/osfans/trime/ime/bar/ui/CandidateUi.kt index dd12314fcd..541285b97b 100644 --- a/app/src/main/java/com/osfans/trime/ime/bar/ui/CandidateUi.kt +++ b/app/src/main/java/com/osfans/trime/ime/bar/ui/CandidateUi.kt @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 Rime community +// +// SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.bar.ui import android.content.Context diff --git a/app/src/main/java/com/osfans/trime/ime/bar/ui/ToolButton.kt b/app/src/main/java/com/osfans/trime/ime/bar/ui/ToolButton.kt index 14aabca4a9..68c6b44392 100644 --- a/app/src/main/java/com/osfans/trime/ime/bar/ui/ToolButton.kt +++ b/app/src/main/java/com/osfans/trime/ime/bar/ui/ToolButton.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.bar.ui import android.content.Context diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/CandidateItemUi.kt b/app/src/main/java/com/osfans/trime/ime/candidates/CandidateItemUi.kt index 6e9e75bc9a..d4bd0912f6 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/CandidateItemUi.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/CandidateItemUi.kt @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 Rime community +// +// SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates import android.content.Context diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/CandidateViewHolder.kt b/app/src/main/java/com/osfans/trime/ime/candidates/CandidateViewHolder.kt index 1fcd5a1857..6f80fa41ac 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/CandidateViewHolder.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/CandidateViewHolder.kt @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 Rime community +// +// SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/CompactCandidateModule.kt b/app/src/main/java/com/osfans/trime/ime/candidates/CompactCandidateModule.kt index 9b7a6ab7a4..ef9429ec7c 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/CompactCandidateModule.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/CompactCandidateModule.kt @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 Rime community +// +// SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates import android.content.Context diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/adapter/CompactCandidateViewAdapter.kt b/app/src/main/java/com/osfans/trime/ime/candidates/adapter/CompactCandidateViewAdapter.kt index 29b2927c1c..513cf8df6c 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/adapter/CompactCandidateViewAdapter.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/adapter/CompactCandidateViewAdapter.kt @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2024 Rime community +// +// SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates.adapter import android.content.Context diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/adapter/PagingCandidateViewAdapter.kt b/app/src/main/java/com/osfans/trime/ime/candidates/adapter/PagingCandidateViewAdapter.kt index 5481edd001..e76f19d9ba 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/adapter/PagingCandidateViewAdapter.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/adapter/PagingCandidateViewAdapter.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates.adapter import android.view.ViewGroup diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/CandidatesPagingSource.kt b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/CandidatesPagingSource.kt index a1848b7009..aa8a71fc5b 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/CandidatesPagingSource.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/CandidatesPagingSource.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates.unrolled import androidx.paging.PagingSource diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/UnrolledCandidateLayout.kt b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/UnrolledCandidateLayout.kt index 8cbe456d54..1ce083b796 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/UnrolledCandidateLayout.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/UnrolledCandidateLayout.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates.unrolled import android.annotation.SuppressLint diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/decoration/FlexboxHorizontalDecoration.kt b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/decoration/FlexboxHorizontalDecoration.kt index 1452bb934a..4c8792edbe 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/decoration/FlexboxHorizontalDecoration.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/decoration/FlexboxHorizontalDecoration.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates.unrolled.decoration import android.graphics.Canvas diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt index 469683d05b..525cd5a632 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates.unrolled.window import android.content.Context diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/FlexboxUnrolledCandidateWindow.kt b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/FlexboxUnrolledCandidateWindow.kt index 743c09969e..b237d814de 100644 --- a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/FlexboxUnrolledCandidateWindow.kt +++ b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/FlexboxUnrolledCandidateWindow.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.ime.candidates.unrolled.window import android.content.Context diff --git a/app/src/main/java/com/osfans/trime/util/EventStateMachine.kt b/app/src/main/java/com/osfans/trime/util/EventStateMachine.kt index f9022a52c0..3e3d635bd0 100644 --- a/app/src/main/java/com/osfans/trime/util/EventStateMachine.kt +++ b/app/src/main/java/com/osfans/trime/util/EventStateMachine.kt @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later + package com.osfans.trime.util /** diff --git a/app/src/main/jni/librime_jni/jni-utils.h b/app/src/main/jni/librime_jni/jni-utils.h index 8e2495b8d5..e0eb5aed39 100644 --- a/app/src/main/jni/librime_jni/jni-utils.h +++ b/app/src/main/jni/librime_jni/jni-utils.h @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2024 Rime community + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/app/src/main/jni/librime_jni/objconv.h b/app/src/main/jni/librime_jni/objconv.h index fb71339231..273e2a278b 100644 --- a/app/src/main/jni/librime_jni/objconv.h +++ b/app/src/main/jni/librime_jni/objconv.h @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2024 Rime community + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + // SPDX-FileCopyrightText: 2015 - 2024 Rime community // // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/app/src/main/res/drawable/ic_baseline_expand_less_24.xml b/app/src/main/res/drawable/ic_baseline_expand_less_24.xml index f8002be77f..2ecfac3980 100644 --- a/app/src/main/res/drawable/ic_baseline_expand_less_24.xml +++ b/app/src/main/res/drawable/ic_baseline_expand_less_24.xml @@ -1,3 +1,9 @@ + + diff --git a/app/src/main/res/drawable/ic_baseline_expand_more_24.xml b/app/src/main/res/drawable/ic_baseline_expand_more_24.xml index af1b10f3c3..02110fe3c3 100644 --- a/app/src/main/res/drawable/ic_baseline_expand_more_24.xml +++ b/app/src/main/res/drawable/ic_baseline_expand_more_24.xml @@ -1,3 +1,9 @@ + + diff --git a/app/src/main/res/values/input_view_ids.xml b/app/src/main/res/values/input_view_ids.xml index c88e57218a..48c8caebcf 100644 --- a/app/src/main/res/values/input_view_ids.xml +++ b/app/src/main/res/values/input_view_ids.xml @@ -1,4 +1,11 @@ + + + diff --git a/gradle.properties b/gradle.properties index 8a96f334a5..c7b43c0c7a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2024 Rime community +# +# SPDX-License-Identifier: GPL-3.0-or-later + # https://developer.android.com/build/optimize-your-build#disable-the-jetifier-flag android.enableJetifier=false android.useAndroidX=true