Skip to content

Commit

Permalink
Added about page
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhanushp
dhanushp committed Aug 17, 2021
1 parent 099a9fc commit 47b012c
Show file tree
Hide file tree
Showing 10 changed files with 200 additions and 72 deletions.
4 changes: 3 additions & 1 deletion .idea/misc.xml
View file

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

2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android {
minSdkVersion 16
targetSdkVersion 30
versionCode 1
versionName "0.1.1"
versionName "1.0.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
Binary file removed app/release/Covid19Tracker v0.1.1-Beta.apk
View file
Binary file not shown.
16 changes: 15 additions & 1 deletion app/src/main/java/com/example/covid_19tracker/AboutActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import android.view.MenuItem;
import android.view.View;


public class AboutActivity extends AppCompatActivity {

@Override
Expand All @@ -19,6 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
getSupportActionBar().setTitle("About");
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);

}

@Override
Expand All @@ -29,6 +31,18 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
}

public void openGit(View view) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.github.com/codewithshubh")));
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.github.com/dhanushp")));
}

public void openInsta(View view) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.instagram.com/dhanush_bangera/")));
}

public void openGit2(View view) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/Sebpool47")));
}

public void openInsta2(View view) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.instagram.com/zer0_.deaths/")));
}
}
17 changes: 9 additions & 8 deletions app/src/main/java/com/example/covid_19tracker/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
Expand Down Expand Up @@ -368,14 +369,14 @@ public boolean onCreateOptionsMenu(Menu menu) {
return true;
}

// @Override
// public boolean onOptionsItemSelected(@NonNull MenuItem item) {
// if(item.getItemId() == R.id.menu_about){
// //Toast.makeText(MainActivity.this, "About menu icon clicked", Toast.LENGTH_SHORT).show();
// startActivity(new Intent(MainActivity.this, AboutActivity.class));
// }
// return super.onOptionsItemSelected(item);
// }
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
if(item.getItemId() == R.id.menu_about){
//Toast.makeText(MainActivity.this, "About menu icon clicked", Toast.LENGTH_SHORT).show();
startActivity(new Intent(MainActivity.this, AboutActivity.class));
}
return super.onOptionsItemSelected(item);
}

@Override
public void onBackPressed() {
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/java/com/example/covid_19tracker/StateWiseDataActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.example.covid_19tracker;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
Expand All @@ -9,6 +10,7 @@
import android.os.Handler;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.MenuItem;
import android.widget.EditText;

import com.android.volley.Request;
Expand Down Expand Up @@ -86,6 +88,13 @@ private void Filter(String text) {
}
stateWiseAdapter.filterList(filteredList, text);
}
// Back button
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
if (item.getItemId() == android.R.id.home)
finish();
return super.onOptionsItemSelected(item);
}



Expand Down
Binary file added app/src/main/res/drawable/dhanush.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions app/src/main/res/drawable/github.xml
View file

This file was deleted.

211 changes: 161 additions & 50 deletions app/src/main/res/layout/activity_about.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="30dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -19,7 +20,7 @@
<androidx.cardview.widget.CardView
android:id="@+id/about_cv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
Expand All @@ -31,59 +32,169 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="20dp">

<!-- <de.hdodenhof.circleimageview.CircleImageView-->
<!-- android:id="@+id/profile_image"-->
<!-- android:layout_width="83dp"-->
<!-- android:layout_height="81dp"-->
<!-- android:layout_gravity="center"-->
<!-- android:layout_marginTop="10dp"-->
<!--&lt;!&ndash; android:src="@drawable/my_image"&ndash;&gt;-->
<!-- app:civ_border_color="#fff"-->
<!-- app:civ_border_width="0.7dp" />-->

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="Dhanush P"
android:textColor="#fff"
android:textSize="22sp"
android:textStyle="bold" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="4SF18CS192"
android:textColor="#c4c4c4"
android:textSize="15sp" />
android:orientation="horizontal"
android:paddingLeft="25dp"
android:paddingRight="25dp"
android:paddingTop="10dp"
android:paddingBottom="10dp">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="25dp"
android:layout_marginBottom="25sp"
android:layout_width="match_parent"
android:layout_height="132dp"
android:orientation="horizontal">

<ImageView
android:id="@+id/github"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:onClick="openGit"
android:src="@drawable/github"
android:contentDescription="TODO" />

<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/dhanush_image"
android:layout_width="110dp"
android:layout_height="114dp"
android:layout_gravity="center"
android:src="@drawable/dhanush" />

<LinearLayout
android:layout_width="229dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="Dhanush P"
android:textColor="#fff"
android:textSize="22sp"
android:textStyle="bold" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="4SF18CS192"
android:textColor="#c4c4c4"
android:textSize="15sp" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:orientation="horizontal">


<ImageView
android:id="@+id/github"
android:layout_width="30dp"
android:layout_height="30dp"
android:onClick="openGit"
android:src="@drawable/ic_github" />

<ImageView
android:id="@+id/insta"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="30dp"
android:onClick="openInsta"
android:src="@drawable/ic_insta"
android:layout_marginLeft="30dp" />

</LinearLayout>
</LinearLayout>
</LinearLayout>


</LinearLayout>
</androidx.cardview.widget.CardView>

<androidx.cardview.widget.CardView
android:id="@+id/about_cv2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:elevation="20dp"
android:padding="20dp"
app:cardBackgroundColor="@color/cardBackground"
app:cardCornerRadius="8dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingLeft="25dp"
android:paddingTop="10dp"
android:paddingRight="25dp"
android:paddingBottom="10dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="132dp"
android:orientation="horizontal">

<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/sebastian_image"
android:layout_width="110dp"
android:layout_height="114dp"
android:layout_gravity="center"
android:src="@drawable/sebastian" />

<LinearLayout
android:layout_width="229dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="Sebastian Thattil"
android:textColor="#fff"
android:textSize="22sp"
android:textStyle="bold" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="4SF18CS128"
android:textColor="#c4c4c4"
android:textSize="15sp" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:orientation="horizontal">


<ImageView
android:id="@+id/github2"
android:layout_width="30dp"
android:layout_height="30dp"
android:onClick="openGit2"
android:src="@drawable/ic_github" />

<ImageView
android:id="@+id/insta2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="30dp"
android:onClick="openInsta2"
android:src="@drawable/ic_insta"
android:layout_marginLeft="30dp" />

</LinearLayout>
</LinearLayout>
</LinearLayout>


</LinearLayout>
</androidx.cardview.widget.CardView>

<TextView
Expand Down Expand Up @@ -134,11 +245,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Version: v1.0.0"
android:textColor="#000000"
android:textSize="12sp"
android:layout_marginBottom="5dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"/>
android:layout_marginBottom="5dp"
android:text="@string/version"
android:textColor="#000000"
android:textSize="12sp" />

</RelativeLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

<!--Credits only-->
<string name="credits">\u2022 <b>covid19india.org</b> for India specific API.
\n\u2022 <b>corona.lmao.ninja</b> for Global API.
\n\u2022 <b>disease.sh</b> for Global API.
\n\u2022 <b>Flaticon</b> for social media icons.
</string>
<string name="libs">\u2022 <b>Glide</b> for showing flag images.
\n\u2022 <b>Eaze Graph</b> for showing Pie charts.
\n\u2022 <b>Circle ImageView</b> to show image in a circular frame
</string>
<string name="version">v0.1.1-Beta</string>
<string name="version">v1.0.0</string>
</resources>

0 comments on commit 47b012c

Please sign in to comment.