Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MatheusAlvesPereira authored Jan 15, 2024
2 parents 8f7f23e + 00b8597 commit b68d9a6
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 11 deletions.
81 changes: 81 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# Contributing

When contributing to this repository, please first discuss the change you wish to make via issue,
email, or any other method with the owners of this repository before making a change.

Please note we have a code of conduct, please follow it in all your interactions with the project.

## Pull Request Process


1. fork the repo.
2. Ensure any install or build dependencies are removed before the end of the layer when doing a
build.
3. Create a new branch for pull request.

## Code of Conduct

### Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.

### Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

### Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

### Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

### Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2023 Matheus Alves.
Copyright (c) 2024 Matheus Alves.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@ this project use JDK 17 Eclipse Version 17.0.9
3. Run Project: <br/>
![Captura de tela 2023-12-11 150849](https://github.com/MatheusAlvesPereira/Anoto-App/assets/99885299/f6134235-cb1a-441e-a34b-1b1dc7c9733f)

# Contributing

When contributing to this repository, please first discuss the change you wish to make via issue,
email, or any other method with the owners of this repository before making a change. [Contributing Guide.](https://github.com/Anoto-ecossistem/Anoto-App/blob/main/CONTRIBUTING.md)

Please note we have a code of conduct, please follow it in all your interactions with the project.

## Pull Request Process


1. fork the repo.
2. Ensure any install or build dependencies are removed before the end of the layer when doing a
build.
3. Create a new branch for pull request.



2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.516"></FrameLayout>
app:layout_constraintVertical_bias="0.516" />

<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomNav"
Expand Down
19 changes: 10 additions & 9 deletions app/src/main/res/layout/fragment_home.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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="match_parent"
Expand All @@ -16,24 +17,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:text="lastname"
android:textSize="16dp" />
android:text="@string/lastname"
android:textSize="16sp" />

<TextView
android:id="@+id/btnDelete"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_alignParentRight="true"
android:drawableLeft="@drawable/ic_task"
android:padding="5dp" />
android:layout_alignParentEnd="true"
android:padding="5dp"
app:drawableStartCompat="@drawable/ic_task" />

<TextView
android:id="@+id/btnEdit"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_marginRight="2dp"
android:layout_toLeftOf="@+id/btnDelete"
android:drawableLeft="@android:drawable/ic_menu_edit"
android:padding="5dp" />
android:layout_marginEnd="2dp"
android:layout_toStartOf="@+id/btnDelete"
android:padding="5dp"
app:drawableLeftCompat="@android:drawable/ic_menu_edit" />
</RelativeLayout>
</FrameLayout>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
<string name="tasks">task</string>
<string name="Home">home</string>
<string name="Create">Create</string>
<string name="lastname">lastname</string>
</resources>

0 comments on commit b68d9a6

Please sign in to comment.