Skip to content

Commit 1dbde30

Browse files
stefan-niedermannAndyScherzinger
stefan-niedermann
authored and
AndyScherzinger
committed
feat(theming): Align theming closer to files app
Follow-Up to #1680 Signed-off-by: Stefan Niedermann <info@niedermann.it>
1 parent 6b336e4 commit 1dbde30

15 files changed

+76
-91
lines changed

‎app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package it.niedermann.owncloud.notes;
22

3-
import android.content.SharedPreferences;
3+
import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;
4+
45
import android.graphics.Typeface;
56
import android.os.Bundle;
67
import android.text.method.LinkMovementMethod;
@@ -10,13 +11,10 @@
1011
import androidx.annotation.Nullable;
1112
import androidx.preference.PreferenceManager;
1213

13-
import it.niedermann.owncloud.notes.R;
1414
import it.niedermann.owncloud.notes.branding.BrandedActivity;
1515
import it.niedermann.owncloud.notes.branding.BrandingUtil;
1616
import it.niedermann.owncloud.notes.databinding.ActivityFormattingHelpBinding;
1717

18-
import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;
19-
2018
public class FormattingHelpActivity extends BrandedActivity {
2119

2220
private ActivityFormattingHelpBinding binding;
@@ -225,6 +223,7 @@ private String buildFormattingHelp() {
225223
@Override
226224
public void applyBrand(int color) {
227225
final var util = BrandingUtil.of(color, this);
228-
util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
226+
util.platform.themeStatusBar(this);
227+
util.material.themeToolbar(binding.toolbar);
229228
}
230229
}

‎app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ protected void onCreate(Bundle savedInstanceState) {
5252
@Override
5353
public void applyBrand(int color) {
5454
final var util = BrandingUtil.of(color, this);
55-
util.material.themeTabLayout(binding.tabs);
56-
util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
55+
util.platform.themeStatusBar(this);
56+
util.material.themeToolbar(binding.toolbar);
57+
util.material.themeTabLayoutOnSurface(binding.tabs);
5758
}
5859

5960
private static class TabsStateAdapter extends FragmentStateAdapter {

‎app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;
55

66
import android.content.Context;
7+
import android.content.res.ColorStateList;
78
import android.graphics.Color;
89
import android.graphics.PorterDuff;
910
import android.graphics.drawable.LayerDrawable;
@@ -21,17 +22,16 @@
2122

2223
import com.google.android.material.appbar.AppBarLayout;
2324
import com.google.android.material.appbar.MaterialToolbar;
25+
import com.google.android.material.card.MaterialCardView;
2426
import com.nextcloud.android.common.ui.theme.MaterialSchemes;
2527
import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase;
26-
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
2728
import com.nextcloud.android.common.ui.theme.utils.MaterialViewThemeUtils;
2829

2930
import it.niedermann.android.util.ColorUtil;
3031
import it.niedermann.owncloud.notes.R;
3132
import it.niedermann.owncloud.notes.main.navigation.NavigationItem;
3233
import it.niedermann.owncloud.notes.shared.util.NotesColorUtil;
3334
import kotlin.Pair;
34-
import scheme.Scheme;
3535

3636
public class NotesViewThemeUtils extends ViewThemeUtilsBase {
3737

@@ -148,4 +148,27 @@ public int getTextHighlightBackgroundColor(@NonNull Context context, @ColorInt i
148148
}
149149
}
150150
}
151+
152+
/**
153+
* @deprecated Should be replaced with {@link com.google.android.material.search.SearchBar} component.
154+
*/
155+
@Deprecated
156+
public void themeSearchCardView(@NonNull MaterialCardView searchBarWrapper) {
157+
withScheme(searchBarWrapper, scheme -> {
158+
searchBarWrapper.setBackgroundTintList(ColorStateList.valueOf(scheme.getSurface()));
159+
return searchBarWrapper;
160+
});
161+
}
162+
163+
/**
164+
* @deprecated Should be replaced with {@link com.google.android.material.search.SearchBar} or {@link MaterialViewThemeUtils#themeToolbar(MaterialToolbar)}
165+
*/
166+
@Deprecated
167+
public void themeSearchToolbar(@NonNull MaterialToolbar toolbar) {
168+
withScheme(toolbar, scheme -> {
169+
toolbar.setNavigationIconTint(scheme.getOnSurface());
170+
toolbar.setTitleTextColor(scheme.getOnSurface());
171+
return toolbar;
172+
});
173+
}
151174
}

‎app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ public void onAccountPicked(@NonNull Account account) {
420420
@Override
421421
public void applyBrand(int color) {
422422
final var util = BrandingUtil.of(color, this);
423-
util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
423+
util.platform.themeStatusBar(this);
424+
util.material.themeToolbar(binding.toolbar);
424425
}
425426
}

‎app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,8 @@ public void applyBrand(int color) {
598598
util.androidx.themeSwipeRefreshLayout(activityBinding.swiperefreshlayout);
599599
util.platform.colorCircularProgressBar(activityBinding.progressCircular, ColorRole.PRIMARY);
600600
util.platform.colorNavigationView(binding.navigationView);
601-
util.notes.applyBrandToPrimaryToolbar(activityBinding.appBar, activityBinding.searchToolbar, colorAccent);
601+
util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper);
602+
util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar);
602603

603604
binding.headerView.setBackgroundColor(color);
604605
@ColorInt final int headerTextColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(color);

‎app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ public void onFailure(@NonNull Call<NotesSettings> call, @NonNull Throwable t) {
210210
@Override
211211
public void applyBrand(int color) {
212212
final var util = BrandingUtil.of(color, this);
213-
util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
213+
util.platform.themeStatusBar(this);
214+
util.material.themeToolbar(binding.toolbar);
214215
}
215216
}

‎app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
3434
@Override
3535
public void applyBrand(int color) {
3636
final var util = BrandingUtil.of(color, this);
37-
util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
37+
util.platform.themeStatusBar(this);
38+
util.material.themeToolbar(binding.toolbar);
3839
}
3940
}

‎app/src/main/res/layout/activity_about.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
android:background="?attr/colorPrimary"
87
android:orientation="vertical">
98

109
<com.google.android.material.appbar.AppBarLayout
1110
android:id="@+id/appBar"
1211
android:layout_width="match_parent"
1312
android:layout_height="wrap_content">
1413

15-
<androidx.appcompat.widget.Toolbar
14+
<com.google.android.material.appbar.MaterialToolbar
1615
android:id="@+id/toolbar"
1716
android:layout_width="match_parent"
18-
android:layout_height="?attr/actionBarSize"
19-
android:layout_marginHorizontal="@dimen/spacer_activity_sides"
20-
app:contentInsetStartWithNavigation="0dp"
17+
android:layout_height="wrap_content"
2118
app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
2219
app:titleMarginStart="0dp"
2320
tools:title="@string/simple_about" />
@@ -26,15 +23,13 @@
2623
android:id="@+id/tabs"
2724
android:layout_width="match_parent"
2825
android:layout_height="wrap_content"
29-
android:background="?attr/colorPrimary"
3026
app:tabMode="fixed" />
3127
</com.google.android.material.appbar.AppBarLayout>
3228

3329
<androidx.viewpager2.widget.ViewPager2
3430
android:id="@+id/pager"
3531
android:layout_width="match_parent"
3632
android:layout_height="wrap_content"
37-
android:background="?attr/colorPrimary"
3833
android:paddingHorizontal="@dimen/spacer_1x" />
3934

4035
</LinearLayout>

‎app/src/main/res/layout/activity_edit.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,13 @@
66
android:layout_height="match_parent"
77
android:orientation="vertical">
88

9-
<com.google.android.material.appbar.AppBarLayout
10-
android:id="@+id/appBar"
9+
<com.google.android.material.appbar.MaterialToolbar
10+
android:id="@+id/toolbar"
1111
android:layout_width="match_parent"
12-
android:layout_height="wrap_content">
13-
14-
<androidx.appcompat.widget.Toolbar
15-
android:id="@+id/toolbar"
16-
android:layout_width="match_parent"
17-
android:layout_height="?attr/actionBarSize"
18-
android:layout_marginHorizontal="@dimen/spacer_activity_sides"
19-
app:contentInsetStartWithNavigation="0dp"
20-
app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
21-
app:titleMarginStart="0dp"
22-
tools:title="Edit Sample note" />
23-
</com.google.android.material.appbar.AppBarLayout>
12+
android:layout_height="wrap_content"
13+
app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
14+
app:titleMarginStart="0dp"
15+
tools:title="Edit Sample note" />
2416

2517
<androidx.fragment.app.FragmentContainerView
2618
android:id="@+id/fragment_container_view"

‎app/src/main/res/layout/activity_exception.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
android:background="?attr/colorPrimary"
87
android:orientation="vertical">
98

10-
<androidx.appcompat.widget.Toolbar
9+
<com.google.android.material.appbar.MaterialToolbar
1110
android:id="@+id/toolbar"
1211
android:layout_width="match_parent"
13-
android:layout_height="?attr/actionBarSize"
14-
android:layout_marginHorizontal="@dimen/spacer_activity_sides"
15-
app:contentInsetStartWithNavigation="0dp"
12+
android:layout_height="wrap_content"
1613
app:elevation="4dp"
1714
app:titleMarginStart="0dp"
1815
tools:title="@string/simple_exception" />

0 commit comments

Comments
 (0)