mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-21 20:35:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

- 🎨 Small design enhancements and theme fixes

Browse source
This commit is contained in:
Stefan Niedermann 2020-06-07 10:32:29 +02:00
parent 0fa8261d6d
commit 2e8976f6f6
14 changed files with 80 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
View file

@ -6,6 +6,7 @@ import android.app.SearchManager;
import android.content.Intent;
import android.database.sqlite.SQLiteException;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
@ -21,6 +22,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.view.ActionMode;
import androidx.appcompat.widget.SearchView;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.GravityCompat;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -78,6 +80,7 @@ import it.niedermann.owncloud.notes.util.NoteUtil;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static it.niedermann.owncloud.notes.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
import static it.niedermann.owncloud.notes.util.ColorUtil.contrastRatioIsSufficient;
import static it.niedermann.owncloud.notes.util.SSOUtil.askForNewAccount;
@ -442,10 +445,14 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
binding.headerView.setBackgroundColor(mainColor);
binding.appName.setTextColor(textColor);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
activityBinding.progressCircular.getIndeterminateDrawable().setColorFilter(getSecondaryForegroundColorDependingOnTheme(this, mainColor), PorterDuff.Mode.SRC_IN);
}
// TODO We assume, that the background of the spinner is always white
activityBinding.swiperefreshlayout.setColorSchemeColors(contrastRatioIsSufficient(Color.WHITE, mainColor) ? mainColor : Color.BLACK);
binding.appName.setTextColor(textColor);
DrawableCompat.setTint(binding.logo.getDrawable(), textColor);
adapter.applyBrand(mainColor, textColor);
adapterCategories.applyBrand(mainColor, textColor);

1
app/src/main/res/layout/activity_edit.xml
View file

@ -24,6 +24,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_container_view"
android:layout_width="match_parent"
android:background="?attr/colorPrimary"
android:layout_height="match_parent" />
</LinearLayout>

1
app/src/main/res/layout/activity_note_list_configuration.xml
View file

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.recyclerview.widget.RecyclerView 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"

4
app/src/main/res/layout/activity_notes_list_view.xml
View file

@ -99,7 +99,6 @@
android:id="@+id/swiperefreshlayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal"
tools:context="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity">
<FrameLayout
@ -115,13 +114,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminateTint="@color/defaultBrand"
tools:targetApi="lollipop"
tools:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_highlighted"
android:scrollbars="vertical"
tools:listitem="@layout/item_notes_list_note_item" />
</FrameLayout>

2
app/src/main/res/layout/dialog_exception.xml
View file

@ -47,7 +47,7 @@
android:layout_marginBottom="@dimen/spacer_2x"
android:layout_weight="1"
android:background="@color/bg_highlighted"
android:padding="8dp"
android:padding="@dimen/spacer_1x"
android:scrollbars="horizontal|vertical"
android:textIsSelectable="true"
android:typeface="monospace"

14
app/src/main/res/layout/drawer_layout.xml
View file

@ -33,13 +33,13 @@
<RelativeLayout
android:id="@+id/header_view"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="@dimen/drawer_header_height"
android:background="@color/defaultBrand">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/logo"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_width="@dimen/drawer_header_logo_size"
android:layout_height="@dimen/drawer_header_logo_size"
android:layout_centerVertical="true"
android:layout_margin="@dimen/spacer_2x"
android:gravity="center"
@ -64,8 +64,8 @@
android:id="@+id/navigationList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingTop="@dimen/spacer_1x"
android:paddingBottom="@dimen/spacer_1x"
app:layoutManager="LinearLayoutManager"
tools:itemCount="6"
tools:listitem="@layout/item_navigation" />
@ -74,8 +74,8 @@
android:id="@+id/navigationMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingTop="@dimen/spacer_1x"
android:paddingBottom="@dimen/spacer_1x"
app:layoutManager="LinearLayoutManager"
tools:itemCount="3"
tools:listitem="@layout/item_navigation" />

4
app/src/main/res/layout/fragment_note_edit.xml
View file

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
tools:background="?attr/colorPrimary">
<ScrollView
android:id="@+id/scrollView"
@ -17,7 +18,6 @@
android:id="@+id/editContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:ems="10"
android:gravity="top"
android:inputType="textMultiLine|textCapSentences"

5
app/src/main/res/layout/fragment_note_preview.xml
View file

@ -3,13 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
tools:background="?attr/colorPrimary">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swiperefreshlayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal"
tools:context="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity"
tools:ignore="MergeRootFrame">
@ -24,7 +24,6 @@
android:id="@+id/single_note_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_normal"
android:padding="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/fg_default"

10
app/src/main/res/layout/item_category.xml
View file

@ -7,14 +7,14 @@
android:background="?android:selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="16dp">
android:padding="@dimen/spacer_2x">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="@dimen/spacer_2x"
android:layout_marginRight="@dimen/spacer_2x"
android:contentDescription="@null"
android:focusable="false"
android:scaleType="center"
@ -36,8 +36,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="@dimen/spacer_2x"
android:layout_marginLeft="@dimen/spacer_2x"
android:textColor="@color/fg_default"
tools:text="23" />
</LinearLayout>

33
app/src/main/res/layout/item_navigation.xml
View file

@ -1,8 +1,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout 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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingStart="@dimen/spacer_1x"
android:paddingLeft="@dimen/spacer_1x"
android:paddingEnd="@dimen/spacer_1x"
@ -17,29 +18,23 @@
android:scaleType="center"
app:srcCompat="@drawable/ic_folder_grey600_24dp" />
<TextView
android:id="@+id/navigationItemCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="8dp"
android:textColor="?android:textColorPrimary"
tools:text="37" />
<TextView
android:id="@+id/navigationItemLabel"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="52dp"
android:layout_marginLeft="52dp"
android:layout_toStartOf="@id/navigationItemCount"
android:layout_toLeftOf="@id/navigationItemCount"
android:layout_marginStart="@dimen/spacer_1x"
android:layout_marginLeft="@dimen/spacer_1x"
android:layout_weight="1"
android:ellipsize="end"
android:lines="1"
android:textColor="?android:textColorSecondary"
tools:text="@tools:sample/lorem/random" />
</RelativeLayout>
<TextView
android:id="@+id/navigationItemCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/spacer_1x"
android:textColor="?android:textColorPrimary"
tools:text="37" />
</LinearLayout>

49
app/src/main/res/layout/item_notes_list_section_item.xml
View file

@ -1,28 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/sectionTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="false"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_alignWithParentIfMissing="true"
android:background="@color/bg_normal"
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingBottom="8dp"
android:paddingLeft="56dp"
android:paddingStart="56dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:paddingTop="48dp"
android:textColor="@color/fg_default_selection"
android:textSize="@dimen/secondary_font_size"
android:hint="@string/listview_updated_yesterday"/>
</RelativeLayout>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/sectionTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="false"
android:layout_alignParentRight="true"
android:background="@color/bg_normal"
android:ellipsize="end"
android:gravity="center_vertical"
android:hint="@string/listview_updated_yesterday"
android:paddingStart="56dp"
android:paddingLeft="56dp"
android:paddingTop="48dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textColor="@color/fg_default_selection"
android:textSize="@dimen/secondary_font_size" />

1
app/src/main/res/layout/item_pref.xml
View file

@ -22,7 +22,6 @@
android:orientation="vertical"
tools:ignore="RtlSymmetry">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"

4
app/src/main/res/values/dimens.xml
View file

@ -7,6 +7,10 @@
<dimen name="spacer_2x">16dp</dimen>
<dimen name="spacer_3x">24dp</dimen>
<!-- Drawer header -->
<dimen name="drawer_header_height">100dp</dimen>
<dimen name="drawer_header_logo_size">42dp</dimen>
<!-- Buttons -->
<dimen name="button_padding">@dimen/spacer_2x</dimen>

12
fastlane/metadata/android/en-US/changelogs/2013001.txt Normal file
View file

@ -0,0 +1,12 @@
2.13.1
- 🎨 Small design enhancements and theme fixes
2.13.0
- ✨ Redesign of UI based on the future Nextcloud Android app
- 🎨 Branding of the Nextcloud instance can be applied (#762)
- 📩 Bulk share content of multiple notes
- 🔧 Move note list widget preferences to database (#832)
- 🐞 Searching for ? character crashes the app (#846)
- 🐞 Fix NullPointerException when server does not respond theming information or other capabilities (#854)