Skip to content

Commit

Permalink
Project Updated
Browse files Browse the repository at this point in the history
  • Loading branch information
arnoldvaz27 committed Aug 24, 2021
1 parent 351e19f commit 241d64d
Show file tree
Hide file tree
Showing 23 changed files with 370 additions and 178 deletions.
3 changes: 2 additions & 1 deletion .idea/misc.xml

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

6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {
compileSdkVersion 30

defaultConfig {
applicationId "com.arnold.countriesofafrica"
applicationId "com.arnoldvaz27.countriesofafrica"
minSdkVersion 22
targetSdkVersion 30
versionCode 1
Expand All @@ -29,9 +29,9 @@ android {

dependencies {

implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.arnold.countriesofafrica;
package com.arnoldvaz27.countriesofafrica;

import android.content.Context;

Expand Down
9 changes: 5 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.arnold.countriesofafrica">
package="com.arnoldvaz27.countriesofafrica.Activity">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
Expand All @@ -15,15 +15,16 @@
android:supportsRtl="true"
android:theme="@style/Theme.CountriesOfAfrica"
tools:ignore="AllowBackup">
<activity android:name=".Activity.MoreMenu"/>
<activity android:name="com.arnold.countriesofafrica.Activity.SplashScreen">
<activity android:name=".MoreMenu"/>
<activity android:name=".SplashScreen"
tools:ignore="IntentFilterExportedReceiver">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.arnold.countriesofafrica.Activity.MainActivity" />
<activity android:name=".MainActivity" />
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.arnold.countriesofafrica.Activity;
package com.arnoldvaz27.countriesofafrica.Activity;

import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
Expand All @@ -20,12 +20,11 @@
import com.android.volley.Request;
import com.android.volley.Response;
import com.android.volley.toolbox.JsonArrayRequest;
import com.arnold.countriesofafrica.Adapter.CountryAdapter;
import com.arnold.countriesofafrica.JavaClasses.MySingleton;
import com.arnold.countriesofafrica.R;
import com.arnold.countriesofafrica.database.CountryDatabase;
import com.arnold.countriesofafrica.entites.Country;
import com.arnold.countriesofafrica.listeners.CountryListeners;
import com.arnoldvaz27.countriesofafrica.Adapter.CountryAdapter;
import com.arnoldvaz27.countriesofafrica.JavaClasses.MySingleton;
import com.arnoldvaz27.countriesofafrica.database.CountryDatabase;
import com.arnoldvaz27.countriesofafrica.entites.Country;
import com.arnoldvaz27.countriesofafrica.listeners.CountryListeners;

import org.json.JSONArray;
import org.json.JSONException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.arnold.countriesofafrica.Activity;
package com.arnoldvaz27.countriesofafrica.Activity;

import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;

import androidx.appcompat.app.AppCompatActivity;

import com.arnold.countriesofafrica.R;

public class MoreMenu extends AppCompatActivity {

Expand All @@ -23,5 +22,9 @@ protected void onCreate(Bundle savedInstanceState) {
findViewById(R.id.developer).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/arnoldvaz27/CountriesOfAfrica"))));
findViewById(R.id.website).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://linktr.ee/arnoldvaz"))));
findViewById(R.id.youtube).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://youtu.be/ZG5YFcH1coY"))));
findViewById(R.id.appStore).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://programmingdrive.blogspot.com/2021/08/Programming%20Drive%20App%20Store.html"))));
findViewById(R.id.asia).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://programmingdrive.blogspot.com/2021/08/Countries%20Applications.html"))));
findViewById(R.id.europe).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://programmingdrive.blogspot.com/2021/08/Countries%20Applications.html"))));

}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.arnold.countriesofafrica.Activity;
package com.arnoldvaz27.countriesofafrica.Activity;

import androidx.appcompat.app.AppCompatActivity;

import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;

import com.arnold.countriesofafrica.R;

//splashscreen of the application
public class SplashScreen extends AppCompatActivity {
Expand All @@ -19,6 +19,10 @@ protected void onCreate(Bundle savedInstanceState) {
getWindow().setStatusBarColor(getResources().getColor(R.color.black));
getWindow().setNavigationBarColor(getResources().getColor(R.color.black));
setContentView(R.layout.splash_screen);

findViewById(R.id.asia).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://programmingdrive.blogspot.com/2021/08/Countries%20Applications.html"))));
findViewById(R.id.appStore).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://programmingdrive.blogspot.com/2021/08/Programming%20Drive%20App%20Store.html"))));

// this new handler will move from splash screen to the main activity of the app after 2 sec or 2000 ms.
new Handler().postDelayed(() -> {
Intent i = new Intent(SplashScreen.this,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.arnold.countriesofafrica.Adapter;
package com.arnoldvaz27.countriesofafrica.Adapter;

import android.annotation.SuppressLint;
import android.view.LayoutInflater;
Expand All @@ -11,10 +11,10 @@
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

import com.arnold.countriesofafrica.R;
import com.arnold.countriesofafrica.JavaClasses.ImageFetch;
import com.arnold.countriesofafrica.entites.Country;
import com.arnold.countriesofafrica.listeners.CountryListeners;
import com.arnoldvaz27.countriesofafrica.Activity.R;
import com.arnoldvaz27.countriesofafrica.JavaClasses.ImageFetch;
import com.arnoldvaz27.countriesofafrica.entites.Country;
import com.arnoldvaz27.countriesofafrica.listeners.CountryListeners;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.arnold.countriesofafrica.JavaClasses;
package com.arnoldvaz27.countriesofafrica.JavaClasses;

import android.content.Context;
import android.net.Uri;
import android.widget.ImageView;
import android.widget.Toast;

import com.arnold.countriesofafrica.R;
import com.arnoldvaz27.countriesofafrica.Activity.R;
import com.github.twocoffeesoneteam.glidetovectoryou.GlideToVectorYou;
import com.github.twocoffeesoneteam.glidetovectoryou.GlideToVectorYouListener;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.arnold.countriesofafrica.JavaClasses;
package com.arnoldvaz27.countriesofafrica.JavaClasses;

import android.annotation.SuppressLint;
import android.content.Context;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.arnold.countriesofafrica.dao;
package com.arnoldvaz27.countriesofafrica.dao;

import androidx.room.Dao;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;

import com.arnold.countriesofafrica.entites.Country;
import com.arnoldvaz27.countriesofafrica.entites.Country;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.arnold.countriesofafrica.database;
package com.arnoldvaz27.countriesofafrica.database;

import android.content.Context;

import androidx.room.Database;
import androidx.room.Room;
import androidx.room.RoomDatabase;

import com.arnold.countriesofafrica.dao.CountryDao;
import com.arnold.countriesofafrica.entites.Country;
import com.arnoldvaz27.countriesofafrica.dao.CountryDao;
import com.arnoldvaz27.countriesofafrica.entites.Country;

//defining the country database is done below
@Database(entities = Country.class, version = 1,exportSchema = false)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.arnold.countriesofafrica.entites;
package com.arnoldvaz27.countriesofafrica.entites;

import androidx.room.ColumnInfo;
import androidx.room.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.arnold.countriesofafrica.listeners;
package com.arnoldvaz27.countriesofafrica.listeners;

import com.arnold.countriesofafrica.entites.Country;
import com.arnoldvaz27.countriesofafrica.entites.Country;

public interface CountryListeners {

Expand Down
Binary file added app/src/main/res/drawable/asia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/europe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/programmingdriveicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Activity.MainActivity"
tools:context=".MainActivity"
android:background="@drawable/splashscreen"
android:orientation="vertical">

Expand Down
Loading

0 comments on commit 241d64d

Please sign in to comment.