Skip to content

Commit

Permalink
Release stable v1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ydasc815
ydasc815 committed Jun 9, 2021
1 parent 4f47aaa commit 671fac6
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 38 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE/" />

<application
android:name=".ui.base.BaseApplication"
android:name=".ui.base.CovidTrackerApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher_covid"
android:label="@string/app_name"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/dsckiet/covid_tracker_android_app/di/AppComponent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import javax.inject.Singleton
ActivityBuilderModule::class,
NetworkModule::class,
ViewModelFactoryModule::class,
ViewModelModule::class
ViewModelModule::class,
RepositoryModule::class
]
)
interface AppComponent : AndroidInjector<BaseApplication> {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/dsckiet/covid_tracker_android_app/ui/base/BaseApplication.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.dsckiet.covid_tracker_android_app.di.DaggerAppComponent
import dagger.android.AndroidInjector
import dagger.android.DaggerApplication

class BaseApplication : DaggerApplication() {
open class BaseApplication : DaggerApplication() {
override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
return DaggerAppComponent.builder().application(this).build()
}
Expand Down
22 changes: 22 additions & 0 deletions app/src/main/java/com/dsckiet/covid_tracker_android_app/ui/base/CovidTrackerApplication.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.dsckiet.covid_tracker_android_app.ui.base

import javax.inject.Inject

class CovidTrackerApplication : BaseApplication() {

// @Inject
// lateinit var notificationWorkerFactory: NotificationWorkerFactory

override fun onCreate() {
super.onCreate()
// notificationWorkerFactory.startNotificationWorkerService(this)
}

// override fun getWorkManagerConfiguration(): Configuration {
// return Configuration.Builder()
// .setMinimumLoggingLevel(android.util.Log.INFO)
// .setWorkerFactory(notificationWorkerFactory)
// .build()
// }

}
6 changes: 3 additions & 3 deletions app/src/main/java/com/dsckiet/covid_tracker_android_app/ui/india/IndiaFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ class IndiaFragment : Fragment() {
binding.nextScreenBtn.setOnClickListener {
navController.navigate(com.dsckiet.covid_tracker_android_app.R.id.action_frag_India_to_stateListFragment)
}
binding.indiaMapBtn.setOnClickListener{
navController.navigate(com.dsckiet.covid_tracker_android_app.R.id.action_frag_India_to_indiaMapFragment)
}
// binding.indiaMapBtn.setOnClickListener{
// navController.navigate(com.dsckiet.covid_tracker_android_app.R.id.action_frag_India_to_indiaMapFragment)
// }
}

override fun onActivityCreated(savedInstanceState: Bundle?) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/dsckiet/covid_tracker_android_app/worker/NotificationWorker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class NotificationWorker(val context: Context, workerParameters: WorkerParameter
Worker(context, workerParameters) {

override fun doWork(): Result {
println("Do Work Called >>> ")
return if (activeIndia != null && lastUpdated != null) {
showNotification(
stringToNumberFormat(activeIndia!!),
Expand Down
64 changes: 32 additions & 32 deletions app/src/main/res/layout/fragment_india.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@

<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="260dp"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
app:cardCornerRadius="8dp"
Expand Down Expand Up @@ -404,37 +404,37 @@
</RelativeLayout>
</androidx.cardview.widget.CardView>

<androidx.cardview.widget.CardView
android:id="@+id/india_map_btn"
android:layout_width="80dp"
android:layout_height="30dp"
android:layout_below="@id/card_rate_growth"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_gravity="end"
android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:background="@color/next_screen_button"
app:cardCornerRadius="4dp"
app:cardElevation="4dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/next_screen_button"
android:gravity="center"
android:orientation="horizontal">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/view_map"
android:textColor="@android:color/white"
android:textSize="15sp"
android:textStyle="bold" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/india_map_btn"-->
<!-- android:layout_width="80dp"-->
<!-- android:layout_height="30dp"-->
<!-- android:layout_below="@id/card_rate_growth"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_gravity="end"-->
<!-- android:layout_marginTop="5dp"-->
<!-- android:layout_marginEnd="20dp"-->
<!-- android:layout_marginRight="20dp"-->
<!-- android:background="@color/next_screen_button"-->
<!-- app:cardCornerRadius="4dp"-->
<!-- app:cardElevation="4dp">-->

<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/next_screen_button"-->
<!-- android:gravity="center"-->
<!-- android:orientation="horizontal">-->

<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/view_map"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="15sp"-->
<!-- android:textStyle="bold" />-->
<!-- </LinearLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
</RelativeLayout>

</androidx.cardview.widget.CardView>
Expand Down

0 comments on commit 671fac6

Please sign in to comment.