Skip to content

Improve color theming and general layouting #16259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndyScherzinger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve color theming and general layouting #16259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import android.webkit.WebView;

import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
import com.nextcloud.client.account.User;
import com.nextcloud.utils.extensions.IntentExtensionsKt;
import com.owncloud.android.R;
Expand Down Expand Up @@ -130,6 +131,8 @@ protected void bindView() {
protected void postOnCreate() {
super.postOnCreate();

viewThemeUtils.platform.colorCircularProgressBar(binding.progressBar2, ColorRole.PRIMARY);

getWebView().setWebChromeClient(new WebChromeClient() {
final EditorWebView activity = EditorWebView.this;

Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ class InternalTwoWaySyncActivity :
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

internalTwoWaySyncAdapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), this, this)
internalTwoWaySyncAdapter =
InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), this, this, viewThemeUtils)

binding = InternalTwoWaySyncLayoutBinding.inflate(layoutInflater)
setContentView(binding.root)
Expand Down Expand Up @@ -163,6 +164,7 @@ class InternalTwoWaySyncActivity :
handleDurationSelected(durations[position].first.inWholeMinutes)
}
}
viewThemeUtils.material.colorTextInputLayout(binding.twoWaySyncIntervalLayout)
}

private fun handleDurationSelected(duration: Long) {
Expand All @@ -184,6 +186,7 @@ class InternalTwoWaySyncActivity :
backgroundJobManager.cancelTwoWaySyncJob()
}
}
viewThemeUtils.material.colorMaterialSwitch(binding.twoWaySyncToggle)
}

private fun checkLayoutVisibilities(condition: Boolean) {
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/java/com/owncloud/android/ui/adapter/InternalTwoWaySyncAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,19 @@ import android.content.Context
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import com.nextcloud.android.common.ui.theme.utils.ColorRole
import com.nextcloud.client.account.User
import com.owncloud.android.databinding.InternalTwoWaySyncViewHolderBinding
import com.owncloud.android.datamodel.FileDataStorageManager
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.utils.theme.ViewThemeUtils

class InternalTwoWaySyncAdapter(
private val dataStorageManager: FileDataStorageManager,
private val user: User,
val context: Context,
private val onUpdateListener: InternalTwoWaySyncAdapterOnUpdate
private val onUpdateListener: InternalTwoWaySyncAdapterOnUpdate,
private val viewThemeUtils: ViewThemeUtils
) : RecyclerView.Adapter<InternalTwoWaySyncViewHolder>() {

interface InternalTwoWaySyncAdapterOnUpdate {
Expand All @@ -30,14 +33,11 @@ class InternalTwoWaySyncAdapter(

var folders: List<OCFile> = dataStorageManager.getInternalTwoWaySyncFolders(user)

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InternalTwoWaySyncViewHolder =
InternalTwoWaySyncViewHolder(
InternalTwoWaySyncViewHolderBinding.inflate(
LayoutInflater.from(parent.context),
parent,
false
)
)
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InternalTwoWaySyncViewHolder {
val binding = InternalTwoWaySyncViewHolderBinding.inflate(LayoutInflater.from(parent.context), parent, false)
viewThemeUtils.platform.colorImageView(binding.folderIcon, ColorRole.PRIMARY)
return InternalTwoWaySyncViewHolder(binding)
}

override fun getItemCount(): Int = folders.size

Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,9 @@ internal class LinkShareViewHolder(itemView: View) : RecyclerView.ViewHolder(ite
}

val label = publicShare.label
if (label.isNullOrEmpty()) {
return
if (!label.isNullOrEmpty()) {
binding.name.text = context.getString(R.string.share_link_with_label, label)
}

binding.name.text = context.getString(R.string.share_link_with_label, label)
}

private fun setSubline(binding: FileDetailsShareLinkShareItemBinding?, context: Context?, publicShare: OCShare) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/ui/adapter/ShareViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ private void setPermissionName(String permissionName) {
if (!TextUtils.isEmpty(permissionName)) {
binding.permissionName.setText(permissionName);
binding.permissionName.setVisibility(View.VISIBLE);
viewThemeUtils.androidx.colorPrimaryTextViewElement(binding.permissionName);
} else {
binding.permissionName.setVisibility(View.GONE);
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
if (getFile() != null && user != null) {
viewThemeUtils.platform.themeHorizontalProgressBar(binding.progressBar);
viewThemeUtils.platform.themeCheckbox(binding.folderSyncButton);
progressListener = new DownloadProgressListener(binding.progressBar);
binding.cancelBtn.setOnClickListener(this);
binding.favorite.setOnClickListener(this);
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import android.view.animation.AnimationUtils;
import android.widget.LinearLayout;

import com.nextcloud.android.common.ui.theme.utils.ColorRole;
import com.nextcloud.client.account.User;
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.database.entity.FileEntity;
Expand Down Expand Up @@ -292,15 +293,22 @@ private void setupView() {
(SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
binding.searchView,
fileActivity.getComponentName());
viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
viewThemeUtils.material.themeSearchCardView(binding.searchCardWrapper);
viewThemeUtils.files.themeContentSearchView(binding.searchView);
viewThemeUtils.platform.colorImageView(binding.searchViewIcon, ColorRole.ON_SURFACE_VARIANT);
viewThemeUtils.platform.colorImageView(binding.pickContactEmailBtn, ColorRole.ON_SURFACE_VARIANT);

viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(binding.sharesListInternalShowAll);
viewThemeUtils.material.colorMaterialTextButton(binding.sharesListInternalShowAll);
binding.sharesListInternalShowAll.setOnClickListener(view -> {
internalShareeListAdapter.toggleShowAll();
int textRes = internalShareeListAdapter.isShowAll() ? R.string.show_less : R.string.show_all;
binding.sharesListInternalShowAll.setText(textRes);
});

viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.createLink);

viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(binding.sharesListExternalShowAll);
viewThemeUtils.material.colorMaterialTextButton(binding.sharesListExternalShowAll);
binding.sharesListExternalShowAll.setOnClickListener(view -> {
externalShareeListAdapter.toggleShowAll();
Expand Down
22 changes: 22 additions & 0 deletions app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@ import android.preference.PreferenceCategory
import android.text.Spannable
import android.text.SpannableString
import android.text.style.ForegroundColorSpan
import android.view.View
import android.widget.ImageView
import android.widget.LinearLayout
import androidx.annotation.DrawableRes
import androidx.annotation.Px
import androidx.annotation.StringRes
import androidx.appcompat.app.ActionBar
import androidx.appcompat.widget.AppCompatAutoCompleteTextView
import androidx.appcompat.widget.SearchView
import androidx.core.content.res.ResourcesCompat
import com.google.android.material.card.MaterialCardView
import com.nextcloud.android.common.ui.color.ColorUtil
Expand All @@ -36,6 +40,7 @@ import me.zhanghai.android.fastscroll.FastScrollerBuilder
import me.zhanghai.android.fastscroll.PopupStyles
import javax.inject.Inject

@Suppress("TooManyFunctions")
class FilesSpecificViewThemeUtils @Inject constructor(
schemes: MaterialSchemes,
private val colorUtil: ColorUtil,
Expand Down Expand Up @@ -256,6 +261,23 @@ class FilesSpecificViewThemeUtils @Inject constructor(
supportActionBar.setHomeAsUpIndicator(tinted)
}

fun themeContentSearchView(searchView: SearchView) {
withScheme(searchView) { scheme ->
// hacky as no default way is provided
val editText = searchView
.findViewById<View?>(androidx.appcompat.R.id.search_src_text) as AppCompatAutoCompleteTextView
val searchPlate = searchView.findViewById<View?>(androidx.appcompat.R.id.search_plate) as LinearLayout
val closeButton = searchView.findViewById<View?>(androidx.appcompat.R.id.search_close_btn) as ImageView
val searchButton = searchView.findViewById<View?>(androidx.appcompat.R.id.search_button) as ImageView
editText.setHintTextColor(scheme.onSurfaceVariant)
editText.highlightColor = scheme.inverseOnSurface
editText.setTextColor(scheme.onSurface)
closeButton.setColorFilter(scheme.onSurface)
searchButton.setColorFilter(scheme.onSurface)
searchPlate.setBackgroundColor(scheme.surfaceContainerHigh)
}
}

companion object {
private val TAG = FilesSpecificViewThemeUtils::class.simpleName

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/file_details_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/two_line_primary_text_size"
android:text="@string/sync" />
</LinearLayout>

Expand Down
83 changes: 45 additions & 38 deletions app/src/main/res/layout/file_details_sharing_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,45 +83,53 @@
</LinearLayout>
</LinearLayout>

<LinearLayout
android:id="@+id/search_container"
<com.google.android.material.card.MaterialCardView
android:id="@+id/searchCardWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/zero">

<ImageView
android:id="@+id/searchViewIcon"
android:layout_width="@dimen/user_icon_size"
android:layout_height="@dimen/user_icon_size"
android:layout_gravity="center_vertical"
android:contentDescription="@string/avatar"
android:padding="@dimen/standard_half_padding"
android:src="@drawable/ic_search_grey" />
android:layout_marginHorizontal="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
app:cardBackgroundColor="@color/grey_600"
app:cardCornerRadius="28dp"
app:strokeWidth="0dp">

<androidx.appcompat.widget.SearchView
android:id="@+id/searchView"
style="@style/ownCloud.SearchView"
android:layout_width="0dp"
<LinearLayout
android:id="@+id/search_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/zero"
android:layout_marginEnd="@dimen/standard_quarter_margin"
android:layout_weight="1"
android:hint="@string/share_search"
app:searchIcon="@null" />

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/pick_contact_email_btn"
android:layout_width="@dimen/minimum_size_for_touchable_area"
android:layout_height="@dimen/minimum_size_for_touchable_area"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/standard_quarter_margin"
android:contentDescription="@string/pick_contact_to_share_with"
android:padding="12dp"
android:src="@drawable/ic_contact_book" />
android:orientation="horizontal">

<ImageView
android:id="@+id/searchViewIcon"
android:layout_width="wrap_content"
android:layout_height="@dimen/minimum_size_for_touchable_area"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/standard_margin"
android:contentDescription="@null"
android:src="@drawable/ic_search_grey" />

<androidx.appcompat.widget.SearchView
android:id="@+id/searchView"
style="@style/ownCloud.SearchView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/share_search"
app:searchIcon="@null" />

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/pick_contact_email_btn"
android:layout_width="@dimen/minimum_size_for_touchable_area"
android:layout_height="@dimen/minimum_size_for_touchable_area"
android:layout_gravity="center_vertical"
android:contentDescription="@string/pick_contact_to_share_with"
android:paddingStart="@dimen/standard_half_padding"
android:paddingEnd="@dimen/standard_padding"
android:src="@drawable/ic_contact_book" />

</LinearLayout>
</LinearLayout>

</com.google.android.material.card.MaterialCardView>

<TextView
android:paddingStart="@dimen/standard_padding"
Expand Down Expand Up @@ -154,7 +162,7 @@
android:id="@+id/divider2"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/listDivider" />
android:background="@color/list_divider_background" />

<TextView
android:id="@+id/external_shares_headline"
Expand All @@ -172,8 +180,8 @@
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_double_margin"
android:layout_marginEnd="@dimen/standard_double_margin"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginEnd="@dimen/standard_margin"
app:icon="@drawable/file_link"
app:iconGravity="textStart"
android:text="@string/create_link" />
Expand Down Expand Up @@ -202,5 +210,4 @@

</FrameLayout>


</androidx.core.widget.NestedScrollView>
16 changes: 8 additions & 8 deletions app/src/main/res/layout/internal_two_way_sync_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@

<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/twoWaySyncToggle"
android:text="@string/prefs_two_way_sync_switch_title"
android:textSize="@dimen/txt_size_16sp"
android:minHeight="48dp"
android:layout_marginHorizontal="@dimen/standard_half_padding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/standard_margin"
android:layout_marginTop="@dimen/alternate_margin"
android:layout_marginBottom="@dimen/alternate_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:minHeight="@dimen/minimum_size_for_touchable_area"
android:text="@string/prefs_two_way_sync_title"
android:textSize="@dimen/txt_size_16sp" />

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/two_way_sync_interval_layout"
android:layout_marginHorizontal="@dimen/standard_half_padding"
style="@style/Widget.Material3.TextInputLayout.FilledBox.ExposedDropdownMenu"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/standard_margin"
android:layout_marginBottom="@dimen/alternate_margin"
android:hint="@string/prefs_two_way_sync_interval">

Expand Down
Loading
Loading