diff --git a/.idea/misc.xml b/.idea/misc.xml index 6e99a11..231050e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,8 @@ - + + diff --git a/app/build.gradle b/app/build.gradle index 4663426..368b3e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { compileSdkVersion 30 defaultConfig { - applicationId "com.arnold.countriesofafrica" + applicationId "com.arnoldvaz27.countriesofafrica" minSdkVersion 22 targetSdkVersion 30 versionCode 1 @@ -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' diff --git a/app/src/androidTest/java/com/arnold/countriesofafrica/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/arnoldvaz27/countriesofafrica/ExampleInstrumentedTest.java similarity index 94% rename from app/src/androidTest/java/com/arnold/countriesofafrica/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/arnoldvaz27/countriesofafrica/ExampleInstrumentedTest.java index 3f13c52..b3bbb9e 100644 --- a/app/src/androidTest/java/com/arnold/countriesofafrica/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/arnoldvaz27/countriesofafrica/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.arnold.countriesofafrica; +package com.arnoldvaz27.countriesofafrica; import android.content.Context; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aa8be46..29a1d4b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.arnoldvaz27.countriesofafrica.Activity"> @@ -15,15 +15,16 @@ android:supportsRtl="true" android:theme="@style/Theme.CountriesOfAfrica" tools:ignore="AllowBackup"> - - + + - + \ No newline at end of file diff --git a/app/src/main/java/com/arnold/countriesofafrica/Activity/MainActivity.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/MainActivity.java similarity index 97% rename from app/src/main/java/com/arnold/countriesofafrica/Activity/MainActivity.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/MainActivity.java index 6715de8..9e60cb4 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/Activity/MainActivity.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.arnold.countriesofafrica.Activity; +package com.arnoldvaz27.countriesofafrica.Activity; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; @@ -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; diff --git a/app/src/main/java/com/arnold/countriesofafrica/Activity/MoreMenu.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/MoreMenu.java similarity index 68% rename from app/src/main/java/com/arnold/countriesofafrica/Activity/MoreMenu.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/MoreMenu.java index 1c78691..af43875 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/Activity/MoreMenu.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/MoreMenu.java @@ -1,4 +1,4 @@ -package com.arnold.countriesofafrica.Activity; +package com.arnoldvaz27.countriesofafrica.Activity; import android.content.Intent; import android.net.Uri; @@ -6,7 +6,6 @@ import androidx.appcompat.app.AppCompatActivity; -import com.arnold.countriesofafrica.R; public class MoreMenu extends AppCompatActivity { @@ -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")))); + } } \ No newline at end of file diff --git a/app/src/main/java/com/arnold/countriesofafrica/Activity/SplashScreen.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/SplashScreen.java similarity index 67% rename from app/src/main/java/com/arnold/countriesofafrica/Activity/SplashScreen.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/SplashScreen.java index 0248808..2806bbc 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/Activity/SplashScreen.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/Activity/SplashScreen.java @@ -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 { @@ -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, diff --git a/app/src/main/java/com/arnold/countriesofafrica/Adapter/CountryAdapter.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/Adapter/CountryAdapter.java similarity index 91% rename from app/src/main/java/com/arnold/countriesofafrica/Adapter/CountryAdapter.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/Adapter/CountryAdapter.java index 0027ba2..e66a72a 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/Adapter/CountryAdapter.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/Adapter/CountryAdapter.java @@ -1,4 +1,4 @@ -package com.arnold.countriesofafrica.Adapter; +package com.arnoldvaz27.countriesofafrica.Adapter; import android.annotation.SuppressLint; import android.view.LayoutInflater; @@ -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; diff --git a/app/src/main/java/com/arnold/countriesofafrica/JavaClasses/ImageFetch.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/JavaClasses/ImageFetch.java similarity index 93% rename from app/src/main/java/com/arnold/countriesofafrica/JavaClasses/ImageFetch.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/JavaClasses/ImageFetch.java index 100db77..3718811 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/JavaClasses/ImageFetch.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/JavaClasses/ImageFetch.java @@ -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; diff --git a/app/src/main/java/com/arnold/countriesofafrica/JavaClasses/MySingleton.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/JavaClasses/MySingleton.java similarity index 95% rename from app/src/main/java/com/arnold/countriesofafrica/JavaClasses/MySingleton.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/JavaClasses/MySingleton.java index 324b40f..80b927d 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/JavaClasses/MySingleton.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/JavaClasses/MySingleton.java @@ -1,4 +1,4 @@ -package com.arnold.countriesofafrica.JavaClasses; +package com.arnoldvaz27.countriesofafrica.JavaClasses; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/arnold/countriesofafrica/dao/CountryDao.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/dao/CountryDao.java similarity index 84% rename from app/src/main/java/com/arnold/countriesofafrica/dao/CountryDao.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/dao/CountryDao.java index 06d63af..a5c8fbb 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/dao/CountryDao.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/dao/CountryDao.java @@ -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; diff --git a/app/src/main/java/com/arnold/countriesofafrica/database/CountryDatabase.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/database/CountryDatabase.java similarity index 81% rename from app/src/main/java/com/arnold/countriesofafrica/database/CountryDatabase.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/database/CountryDatabase.java index 86061d3..1b6476a 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/database/CountryDatabase.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/database/CountryDatabase.java @@ -1,4 +1,4 @@ -package com.arnold.countriesofafrica.database; +package com.arnoldvaz27.countriesofafrica.database; import android.content.Context; @@ -6,8 +6,8 @@ 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) diff --git a/app/src/main/java/com/arnold/countriesofafrica/entites/Country.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/entites/Country.java similarity index 97% rename from app/src/main/java/com/arnold/countriesofafrica/entites/Country.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/entites/Country.java index 52e9024..fee0c21 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/entites/Country.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/entites/Country.java @@ -1,4 +1,4 @@ -package com.arnold.countriesofafrica.entites; +package com.arnoldvaz27.countriesofafrica.entites; import androidx.room.ColumnInfo; import androidx.room.Entity; diff --git a/app/src/main/java/com/arnold/countriesofafrica/listeners/CountryListeners.java b/app/src/main/java/com/arnoldvaz27/countriesofafrica/listeners/CountryListeners.java similarity index 55% rename from app/src/main/java/com/arnold/countriesofafrica/listeners/CountryListeners.java rename to app/src/main/java/com/arnoldvaz27/countriesofafrica/listeners/CountryListeners.java index 86a1e88..562a816 100644 --- a/app/src/main/java/com/arnold/countriesofafrica/listeners/CountryListeners.java +++ b/app/src/main/java/com/arnoldvaz27/countriesofafrica/listeners/CountryListeners.java @@ -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 { diff --git a/app/src/main/res/drawable/asia.png b/app/src/main/res/drawable/asia.png new file mode 100644 index 0000000..67e17d0 Binary files /dev/null and b/app/src/main/res/drawable/asia.png differ diff --git a/app/src/main/res/drawable/europe.png b/app/src/main/res/drawable/europe.png new file mode 100644 index 0000000..2162327 Binary files /dev/null and b/app/src/main/res/drawable/europe.png differ diff --git a/app/src/main/res/drawable/programmingdriveicon.png b/app/src/main/res/drawable/programmingdriveicon.png new file mode 100644 index 0000000..56f2fd8 Binary files /dev/null and b/app/src/main/res/drawable/programmingdriveicon.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1ef5336..4dcb1a8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -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"> diff --git a/app/src/main/res/layout/more_menu.xml b/app/src/main/res/layout/more_menu.xml index 2a2a7a8..6ba8a10 100644 --- a/app/src/main/res/layout/more_menu.xml +++ b/app/src/main/res/layout/more_menu.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".Activity.MoreMenu" + tools:context=".MoreMenu" android:background="@drawable/splashscreen" android:orientation="vertical"> @@ -39,165 +39,272 @@ - - - + android:scrollbars="none"> - + android:orientation="vertical"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/splash_screen.xml b/app/src/main/res/layout/splash_screen.xml index 622e14e..b6e7cc8 100644 --- a/app/src/main/res/layout/splash_screen.xml +++ b/app/src/main/res/layout/splash_screen.xml @@ -5,7 +5,44 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" - tools:context=".Activity.MainActivity"> + tools:context=".SplashScreen"> + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e6c068a..c78b674 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,4 +9,5 @@ #FFFFFFFF #8A2E2E + #333333 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 763d100..0d87ec7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,4 +13,8 @@ For Developer Website YouTube + Click here to download countries of Asia + Get More Apps on Programming Drive App Store. Click Here + Click Here to download Countries Of Europe + Programming Drive App Store \ No newline at end of file diff --git a/app/src/test/java/com/arnold/countriesofafrica/ExampleUnitTest.java b/app/src/test/java/com/arnoldvaz27/countriesofafrica/ExampleUnitTest.java similarity index 88% rename from app/src/test/java/com/arnold/countriesofafrica/ExampleUnitTest.java rename to app/src/test/java/com/arnoldvaz27/countriesofafrica/ExampleUnitTest.java index 89edfa8..02a6222 100644 --- a/app/src/test/java/com/arnold/countriesofafrica/ExampleUnitTest.java +++ b/app/src/test/java/com/arnoldvaz27/countriesofafrica/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.arnold.countriesofafrica; +package com.arnoldvaz27.countriesofafrica; import org.junit.Test;