Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
os
Notes
Commits
f76dbb1e
Commit
f76dbb1e
authored
Jan 18, 2021
by
Romain Hunault
Browse files
Merge branch 'icon-fixes' into 'master'
Icon fixes See merge request e/apps/notes!18
parents
98d8d7f3
4c0a9d8c
Pipeline
#96919
failed with stage
in 1 minute and 6 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java
View file @
f76dbb1e
...
...
@@ -44,6 +44,7 @@ import androidx.appcompat.view.ActionMode;
import
androidx.appcompat.widget.AppCompatImageView
;
import
androidx.appcompat.widget.SearchView
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.core.view.GravityCompat
;
import
androidx.drawerlayout.widget.DrawerLayout
;
import
androidx.recyclerview.widget.ItemTouchHelper
;
import
androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback
;
...
...
@@ -335,8 +336,19 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
private
void
setupActionBar
()
{
setSupportActionBar
(
toolbar
);
drawerToggle
=
new
ActionBarDrawerToggle
(
this
,
drawerLayout
,
toolbar
,
R
.
string
.
action_drawer_open
,
R
.
string
.
action_drawer_close
);
drawerToggle
.
setDrawerIndicatorEnabled
(
tru
e
);
drawerToggle
.
setDrawerIndicatorEnabled
(
fals
e
);
drawerLayout
.
addDrawerListener
(
drawerToggle
);
drawerToggle
.
setHomeAsUpIndicator
(
lineageos
.
platform
.
R
.
drawable
.
ic_hamburger
);
if
(
toolbar
.
getNavigationIcon
()
!=
null
)
toolbar
.
getNavigationIcon
().
setTint
(
getResources
().
getColor
(
lineageos
.
platform
.
R
.
color
.
color_default_accent
));
drawerToggle
.
setToolbarNavigationClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
view
)
{
drawerLayout
.
openDrawer
(
GravityCompat
.
START
);
}
});
}
private
void
setupNotesList
()
{
...
...
app/src/main/java/foundation/e/notes/model/ItemAdapter.java
View file @
f76dbb1e
...
...
@@ -105,7 +105,7 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
nvHolder
.
noteCategory
.
setText
(
Html
.
fromHtml
(
note
.
getCategory
()));
nvHolder
.
noteExcerpt
.
setText
(
Html
.
fromHtml
(
note
.
getExcerpt
()));
nvHolder
.
noteStatus
.
setVisibility
(
DBStatus
.
VOID
.
equals
(
note
.
getStatus
())
?
View
.
INVISIBLE
:
View
.
VISIBLE
);
nvHolder
.
noteFavorite
.
setImageResource
(
note
.
isFavorite
()
?
R
.
drawable
.
ic_star_yellow_24dp
:
R
.
drawable
.
ic_star_border_white_24dp
);
nvHolder
.
noteFavorite
.
setImageResource
(
note
.
isFavorite
()
?
lineageos
.
platform
.
R
.
drawable
.
ic_star_filled
:
lineageos
.
platform
.
R
.
drawable
.
ic_star
);
nvHolder
.
noteFavorite
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
view
)
{
...
...
app/src/main/res/layout/activity_notes_list_view.xml
View file @
f76dbb1e
...
...
@@ -41,8 +41,9 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id=
"@+id/fab_create"
style=
"@style/fab"
android:src=
"@drawable/ic_add
_white_24dp
"
android:src=
"@
lineageos.platform:
drawable/ic_add"
android:title=
"@string/action_create"
app:backgroundTint=
"@color/accent_color"
app:rippleColor=
"@color/primary_dark"
/>
app:backgroundTint=
"@color/primary"
app:rippleColor=
"@color/primary_dark"
app:tint=
"@color/accent_color"
/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
app/src/main/res/layout/drawer_layout.xml
View file @
f76dbb1e
...
...
@@ -36,6 +36,7 @@
android:layout_height=
"wrap_content"
android:visibility=
"gone"
android:background=
"?attr/colorAccent"
android:visibility=
"gone"
android:theme=
"@style/AppTheme"
>
<androidx.appcompat.widget.AppCompatImageView
...
...
@@ -100,7 +101,7 @@
android:id=
"@+id/navigationList"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingTop=
"
8
dp"
android:paddingTop=
"
24
dp"
android:paddingBottom=
"8dp"
app:layoutManager=
"LinearLayoutManager"
/>
...
...
@@ -123,4 +124,4 @@
</com.google.android.material.navigation.NavigationView>
</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
</androidx.drawerlayout.widget.DrawerLayout>
app/src/main/res/layout/fragment_notes_list_note_item.xml
View file @
f76dbb1e
...
...
@@ -42,7 +42,8 @@
android:contentDescription=
"@string/menu_favorite"
android:padding=
"16dp"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
/>
android:layout_height=
"match_parent"
android:tint=
"@color/accent_color"
/>
<ImageView
...
...
app/src/main/res/menu/menu_list_view.xml
View file @
f76dbb1e
...
...
@@ -5,9 +5,10 @@
tools:context=
"com.example.owncloudnotes.NotesListViewActivity"
>
<item
android:id=
"@+id/search"
android:icon=
"@drawable/ic_search
_white_24dp
"
android:icon=
"@
lineageos.platform:
drawable/ic_search"
android:title=
"@string/action_search"
app:actionViewClass=
"androidx.appcompat.widget.SearchView"
app:iconTint=
"@color/accent_color"
android:searchIcon=
"@lineageos.platform:drawable/ic_search"
app:showAsAction=
"collapseActionView|always"
/>
</menu>
\ No newline at end of file
app/src/main/res/menu/menu_note_fragment.xml
View file @
f76dbb1e
...
...
@@ -4,7 +4,7 @@
<item
android:id=
"@+id/search"
android:icon=
"@drawable/ic_search
_white_24dp
"
android:icon=
"@
lineageos.platform:
drawable/ic_search"
android:orderInCategory=
"50"
android:title=
"@string/action_search"
app:actionViewClass=
"androidx.appcompat.widget.SearchView"
...
...
e-ui-sdk.jar
View file @
f76dbb1e
No preview for this file type
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment