Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Hardcoded String Fix Some Padding Margin Code Error etc #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion app/src/main/res/layout/activity_achievements.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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="match_parent"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/activity_goals__completed.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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="match_parent"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/activity_goals__missed.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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="match_parent"
Expand Down
13 changes: 7 additions & 6 deletions app/src/main/res/layout/activity_today.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
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"
tools:context="TodayActivity"
android:layout_width = "fill_parent"
Expand All @@ -23,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/name"
android:text="Task :"
android:text="@string/task"
android:fontFamily="sans-serif-smallcaps"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
Expand Down Expand Up @@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/from"
android:text="From :"
android:text="@string/from"
android:fontFamily="sans-serif-smallcaps"
android:layout_gravity="center_vertical"
android:layout_marginTop="10dp"
Expand All @@ -96,8 +96,9 @@
android:id = "@+id/simpleTimePicker"
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:paddingLeft="38dp"
android:timePickerMode ="spinner" />
android:paddingStart="38dp"
android:timePickerMode ="spinner"
tools:ignore="RtlSymmetry" />

</LinearLayout>
<View
Expand All @@ -116,7 +117,7 @@
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:layout_gravity="center_vertical"
android:text = "Notify at : "
android:text = "@string/notify_at"
android:fontFamily="sans-serif-smallcaps"
android:textSize="16sp"
android:layout_marginTop="10dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/items.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="TODAY"
android:text="@string/today"
android:gravity="center"
android:textColor="#000000"
android:id="@+id/text"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/items1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="BREAKFAST"
android:text="@string/breakfast"
android:gravity="center"
android:textColor="#000000"
android:id="@+id/text1"
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout/items2.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_margin="10dp"
Expand All @@ -18,7 +19,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/tick"
android:id="@+id/image2"/>
android:id="@+id/image2"
tools:ignore="ContentDescription" />
</LinearLayout>

</android.support.v7.widget.CardView>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout/items3.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_margin="10dp"
Expand All @@ -18,7 +19,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/achievements"
android:id="@+id/image3"/>
android:id="@+id/image3"
tools:ignore="ContentDescription" />
</LinearLayout>

</android.support.v7.widget.CardView>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/parallax1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
android:layout_alignLeft="@+id/imageView3"
android:layout_alignStart="@+id/imageView3"
android:layout_below="@+id/imageView2"
android:src="@drawable/ic_goals" />
android:src="@drawable/ic_goals"
tools:ignore="RtlHardcoded" />

<ImageView
android:id="@+id/imageView"
Expand Down
15 changes: 10 additions & 5 deletions app/src/main/res/layout/parallax2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
android:layout_marginLeft="11dp"
android:layout_marginStart="11dp"
android:layout_marginTop="16dp"
android:src="@drawable/ic_guide" />
android:src="@drawable/ic_guide"
tools:ignore="RtlHardcoded" />

<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/compass2"
Expand All @@ -26,7 +27,8 @@
android:layout_alignTop="@+id/compass4"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:src="@drawable/ic_guide" />
android:src="@drawable/ic_guide"
tools:ignore="RtlHardcoded" />

<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/compass3"
Expand All @@ -35,7 +37,8 @@
android:layout_below="@+id/compass2"
android:layout_toEndOf="@+id/compass2"
android:layout_toRightOf="@+id/compass2"
android:src="@drawable/ic_guide" />
android:src="@drawable/ic_guide"
tools:ignore="RtlHardcoded" />

<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/compass4"
Expand All @@ -45,7 +48,8 @@
android:layout_marginTop="132dp"
android:layout_toEndOf="@+id/compass3"
android:layout_toRightOf="@+id/compass3"
android:src="@drawable/ic_guide" />
android:src="@drawable/ic_guide"
tools:ignore="RtlHardcoded" />

<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/compass5"
Expand All @@ -54,5 +58,6 @@
android:layout_above="@+id/compass2"
android:layout_toEndOf="@+id/compass2"
android:layout_toRightOf="@+id/compass2"
android:src="@drawable/ic_guide" />
android:src="@drawable/ic_guide"
tools:ignore="RtlHardcoded" />
</RelativeLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/parallax4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.289"
android:layout_marginRight="8dp"
android:layout_marginLeft="48dp" />
android:layout_marginLeft="48dp"
tools:ignore="RtlHardcoded" />


</android.support.constraint.ConstraintLayout>
7 changes: 6 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<string name="lunch">LUNCH</string>
<string name="games">GAMES</string>
<string name="dinner">DINNER</string>

<string name="notifyat">Notify at :</string>
<!-- Strings for titles of each page of the welcome screen -->
<string name="title_welcome">Welcome to Daily Goals</string>
<string name="title_life_guide">Life Guide and Assistant</string>
Expand All @@ -35,4 +35,9 @@
<string name="goals_missed">GOALS MISSED</string>
<string name="goals_completed">GOALS COMPLETED</string>
<string name="your_achievements">YOUR ACHIEVEMENTS</string>
<string name="notify_at">Notify at :</string>
<string name="from">From :</string>
<string name="task">Task :</string>
<string name="today">TODAY</string>
<string name="breakfast">BREAKFAST</string>
</resources>
10 changes: 6 additions & 4 deletions local.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
## This file must *NOT* be checked into Version Control Systems,
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Sun Apr 29 18:38:18 IST 2018
ndk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk\\ndk-bundle
sdk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk
#Mon May 14 15:05:45 IST 2018
sdk.dir=C\:\\Users\\sukhbeer singh\\AppData\\Local\\Android\\Sdk