浏览代码

changes after rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 4 年之前
父节点
当前提交
640820826f

+ 36 - 0
src/main/java/com/nextcloud/ui/ClearStatusTask.kt

@@ -0,0 +1,36 @@
+/*
+ *
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2020 Tobias Kaminsky
+ * Copyright (C) 2020 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.nextcloud.ui
+
+import android.accounts.Account
+import android.content.Context
+import com.owncloud.android.lib.common.OwnCloudClientFactory
+import com.owncloud.android.lib.resources.users.ClearStatusMessageRemoteOperation
+
+public class ClearStatusTask(val account: Account?, val context: Context?) : Function0<Boolean> {
+    override fun invoke(): Boolean {
+        val client = OwnCloudClientFactory.createNextcloudClient(account, context)
+
+        return ClearStatusMessageRemoteOperation().execute(client).isSuccess
+    }
+}

+ 29 - 0
src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusClickListener.kt

@@ -0,0 +1,29 @@
+/*
+ *
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2020 Tobias Kaminsky
+ * Copyright (C) 2020 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui.adapter
+
+import com.owncloud.android.lib.resources.users.PredefinedStatus
+
+interface PredefinedStatusClickListener {
+    fun onClick(predefinedStatus: PredefinedStatus)
+}

+ 1 - 1
src/main/java/com/owncloud/android/utils/BitmapUtils.java

@@ -210,7 +210,7 @@ public final class BitmapUtils {
             try {
                 hash = md5(hash);
             } catch (NoSuchAlgorithmException e) {
-                int color = getResources().getColor(R.color.primary);
+                int color = getResources().getColor(R.color.primary_dark);
                 return new Color(android.graphics.Color.red(color),
                                  android.graphics.Color.green(color),
                                  android.graphics.Color.blue(color));