mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-10-25 14:15:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Replace direct color assignments with ?android: attributes

Browse source
This commit is contained in:
stefan-niedermann 2020-01-25 16:57:06 +01:00
parent 18dd44f848
commit b751dfe310
7 changed files with 24 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout/item_account.xml
View file

@ -30,8 +30,7 @@
android:layout_marginEnd="64dp"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="@color/fg_default"
android:textAppearance="@style/NavigationItem"
android:textColor="?android:textColorPrimary"
tools:hint="Username"/>
<androidx.appcompat.widget.AppCompatImageView

3
app/src/main/res/layout/item_account_choose.xml
View file

@ -26,8 +26,7 @@
android:singleLine="true"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:textColor="@color/fg_default"
android:textAppearance="@style/NavigationItem"
android:textColor="?android:textColorPrimary"
tools:hint="Username"/>
</LinearLayout>

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

@ -28,7 +28,7 @@
android:layout_weight="1"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="@color/fg_default"
android:textColor="?android:textColorPrimary"
tools:hint="@string/menu_change_category" />
<TextView

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

@ -1,46 +1,46 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:paddingLeft="6dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="6dp"
android:paddingRight="8dp"
android:paddingEnd="8dp">
android:paddingLeft="6dp"
android:paddingEnd="8dp"
android:paddingRight="8dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/navigationItemIcon"
android:layout_width="44dp"
android:layout_height="44dp"
android:contentDescription="@null"
android:focusable="false"
android:padding="10dp"
android:scaleType="center"
android:focusable="false"
app:srcCompat="@drawable/ic_folder_grey600_24dp"
android:contentDescription="@null" />
app:srcCompat="@drawable/ic_folder_grey600_24dp" />
<TextView
android:id="@+id/navigationItemCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="8dp"
android:textAppearance="@style/NavigationItem"
tools:text="37"/>
android:textColor="?android:textColorPrimary"
tools:text="37" />
<TextView
android:id="@+id/navigationItemLabel"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="64dp"
android:layout_marginLeft="64dp"
android:layout_toStartOf="@id/navigationItemCount"
android:layout_toLeftOf="@id/navigationItemCount"
android:layout_centerVertical="true"
android:layout_marginLeft="64dp"
android:layout_marginStart="64dp"
android:ellipsize="end"
android:lines="1"
android:textAppearance="@style/NavigationItem"
android:textColor="?android:textColorSecondary"
tools:text="Category 1" />
</RelativeLayout>

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

@ -81,8 +81,8 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_weight="1"
android:textColor="@drawable/list_item_color_selector"
android:textSize="@dimen/primary_font_size"
android:textColor="?android:textColorPrimary"
tools:text="The title of the note"/>
</androidx.appcompat.widget.LinearLayoutCompat>
@ -102,7 +102,6 @@
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_weight="1"
android:textColor="@drawable/list_item_color_selector_low"
android:textSize="@dimen/secondary_font_size"
tools:text="This is the content of the first line."/>
@ -121,7 +120,7 @@
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:singleLine="true"
android:textColor="@drawable/list_item_color_selector"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/secondary_font_size"
tools:text="My fancy category"/>
</androidx.appcompat.widget.LinearLayoutCompat>

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

@ -30,7 +30,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textColor="@color/fg_default"
android:textColor="?android:textColorPrimary"
tools:text="@string/action_settings" />
<TextView
@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="2"
android:textColor="@color/fg_default_low"
android:textColor="?android:textColorSecondary"
tools:text="This is a summary" />
</LinearLayout>

12
app/src/main/res/values/styles.xml
View file

@ -1,21 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="AppTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
<style name="AppTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary</item>
<item name="colorAccent">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:windowBackground">@color/bg_normal</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="ncAlertDialog" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorAccent">@color/primary</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary</item>
<item name="android:textColorPrimary">@color/fg_default</item>
<item name="android:windowBackground">@color/bg_normal</item>
</style>
@ -31,10 +27,4 @@
<style name="SplashTheme" parent="AppTheme">
<item name="android:windowBackground">@drawable/splashscreen</item>
</style>
<style name="NavigationItem">
<item name="android:textSize">@dimen/secondary_font_size</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textColor">#de000000</item>
</style>
</resources>