Merge pull request #1624 from fossasia/development

chore(release): v0.2.0

Author: iamareebjamal

.github/auto_label.yml

@@ -0,0 +1,14 @@
+labels: [fix, chore, ui]
+labelMapping:
+  feat: [feature]
+  fix(ui): [fix, ui]
+  feat(ui): [feat, ui]
+  refactor: [chore, refactor]
+  chore(refactor): [chore, refactor]
+  chore(deps): [dependencies]
+  chore(docs): [chore, docs]
+  docs: [chore, docs]
+  test: [chore, test]
+  chore(ci): [chore, tools, ci]
+  chore(tools): [chore, tools]
+  chore(release): [chore, release]

.github/release-drafter.yml

@@ -7,6 +7,8 @@ categories:
     label: fix
   - title: 🧰 Maintenance
     label: chore
+  - title: Dependencies and Libraries
+    label: dependencies
 change-template: '- $TITLE (#$NUMBER) - @$AUTHOR'
 template: |
   ## Changes

app/build.gradle

@@ -15,10 +15,10 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.eventyay.attendee"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 28
-        versionCode 6
-        versionName "0.1.2"
+        versionCode 7
+        versionName "0.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -92,20 +92,20 @@ repositories {
 }
 
 dependencies {
-    def lifecycle_version = "2.1.0-alpha03"
+    def lifecycle_version = "2.1.0-alpha04"
     def koin_version = "1.0.2"
     def roomVersion = "2.1.0-alpha06"
     def ktx_version = "1.0.0"
     def ktx2_version = "2.0.0"
-    def nav_version = "2.1.0-alpha01"
+    def nav_version = "2.1.0-alpha02"
     def anko_version = "0.10.8"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha03'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04'
     implementation 'com.google.android.material:material:1.1.0-alpha05'
     implementation "androidx.browser:browser:1.0.0"
     implementation 'androidx.exifinterface:exifinterface:1.0.0'
@@ -142,7 +142,7 @@ dependencies {
 
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8"
     implementation 'com.github.jasminb:jsonapi-converter:0.9'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
     implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-jackson:2.5.0'
 
@@ -158,7 +158,7 @@ dependencies {
     implementation 'com.squareup.picasso:picasso:2.71828'
 
     // Stripe
-    implementation 'com.stripe:stripe-android:8.5.0'
+    implementation 'com.stripe:stripe-android:8.7.0'
 
     // QR Code
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
@@ -169,6 +169,7 @@ dependencies {
 
     //Anko
     implementation "org.jetbrains.anko:anko-commons:$anko_version"
+    implementation "org.jetbrains.anko:anko-design:$anko_version"
 
     // Stetho
     debugImplementation 'com.facebook.stetho:stetho:1.5.1'

app/src/fdroid/java/org/fossasia/openevent/general/auth/SmartAuthUtil.kt

@@ -0,0 +1,15 @@
+package org.fossasia.openevent.general.auth
+
+import android.app.Activity
+
+object SmartAuthUtil {
+    fun getCredentialsClient(activity: Activity): Any {
+        return Unit
+    }
+
+    fun handleResolvableApiException(rae: Any, activity: Activity, value: Any) {
+    }
+    fun getEmailAddressFromIntent(intent: Any?): String? {
+        return null
+    }
+}

app/src/fdroid/java/org/fossasia/openevent/general/auth/SmartAuthViewModel.kt

@@ -0,0 +1,26 @@
+package org.fossasia.openevent.general.auth
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+const val RC_CREDENTIALS_READ = 2
+class SmartAuthViewModel : ViewModel() {
+
+    val mutableId = MutableLiveData<String>()
+    val id: LiveData<String> = mutableId
+    private val mutablePassword = MutableLiveData<String>()
+    val password: LiveData<String> = mutablePassword
+    private val mutableProgress = MutableLiveData<Boolean>()
+    val progress: LiveData<Boolean> = mutableProgress
+    private val mutableApiExceptionRequestCodePair = MutableLiveData<Pair<Any, Any>>()
+    val apiExceptionCodePair: LiveData<Pair<Any, Any>> = mutableApiExceptionRequestCodePair
+
+    fun requestCredentials(any: Any) {
+        return
+    }
+
+    fun saveCredential(any1: Any, any2: Any, any3: Any) {
+        return
+    }
+}

app/src/fdroid/java/org/fossasia/openevent/general/search/SmartAuthViewModel.kt

@@ -27,5 +27,14 @@
         <meta-data
             android:name="com.stripe.android.API_KEY"
             android:value="${STRIPE_API_TOKEN}"/>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider"/>
+        </provider>
     </application>
 </manifest>

app/src/main/AndroidManifest.xml

@@ -1,25 +1,30 @@
 package org.fossasia.openevent.general
 
+import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.NavigationUI.setupWithNavController
-import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_main.navigation
 import kotlinx.android.synthetic.main.activity_main.navigationAuth
 import kotlinx.android.synthetic.main.activity_main.mainFragmentCoordinatorLayout
 import org.fossasia.openevent.general.auth.EditProfileFragment
-import org.fossasia.openevent.general.search.RC_CREDENTIALS_READ
-import org.fossasia.openevent.general.search.RC_CREDENTIALS_SAVE
-import org.fossasia.openevent.general.search.SmartAuthViewModel
+import org.fossasia.openevent.general.auth.RC_CREDENTIALS_READ
+import org.fossasia.openevent.general.auth.SmartAuthViewModel
+import org.fossasia.openevent.general.auth.SmartAuthUtil
 import org.fossasia.openevent.general.utils.Utils.navAnimGone
 import org.fossasia.openevent.general.utils.Utils.navAnimVisible
+import org.jetbrains.anko.design.snackbar
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+const val PLAY_STORE_BUILD_FLAVOR = "playStore"
 
 class MainActivity : AppCompatActivity() {
     private lateinit var navController: NavController
     private var currentFragmentId: Int = 0
+    private val smartAuthViewModel by viewModel<SmartAuthViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         setTheme(R.style.AppTheme)
@@ -71,9 +76,7 @@ class MainActivity : AppCompatActivity() {
             R.id.loginFragment,
             R.id.signUpFragment -> {
                 navController.popBackStack(R.id.eventsFragment, false)
-                Snackbar.make(
-                    mainFragmentCoordinatorLayout, R.string.sign_in_canceled, Snackbar.LENGTH_SHORT
-                ).show()
+                mainFragmentCoordinatorLayout.snackbar(R.string.sign_in_canceled)
             }
             R.id.orderCompletedFragment -> navController.popBackStack(R.id.eventDetailsFragment, false)
             R.id.welcomeFragment -> finish()
@@ -95,10 +98,20 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == RC_CREDENTIALS_READ || requestCode == RC_CREDENTIALS_SAVE)
-            SmartAuthViewModel().onActivityResult(requestCode, resultCode, data, this)
-        else
+
+        if (BuildConfig.FLAVOR == PLAY_STORE_BUILD_FLAVOR && requestCode == RC_CREDENTIALS_READ) {
+            if (resultCode == Activity.RESULT_OK) {
+                // Fill in the email field in LoginFragment
+                val email = SmartAuthUtil.getEmailAddressFromIntent(data)
+                if (email != null) {
+                    smartAuthViewModel.apply {
+                        mutableId.value = email
+                    }
+                }
+            }
+        } else {
             super.onActivityResult(requestCode, resultCode, data)
+        }
     }
 }
 

app/src/main/java/org/fossasia/openevent/general/MainActivity.kt

@@ -6,42 +6,37 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.snackbar.Snackbar
+import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.fragment_about_event.view.appBar
 import kotlinx.android.synthetic.main.fragment_about_event.view.progressBarAbout
 import kotlinx.android.synthetic.main.fragment_about_event.view.aboutEventContent
 import kotlinx.android.synthetic.main.fragment_about_event.view.aboutEventDetails
 import kotlinx.android.synthetic.main.fragment_about_event.view.eventName
 import kotlinx.android.synthetic.main.fragment_about_event.view.detailsHeader
-import kotlinx.android.synthetic.main.fragment_about_event.view.aboutEventCollapsingLayout
+import kotlinx.android.synthetic.main.fragment_about_event.view.aboutEventImage
 import org.fossasia.openevent.general.R
 import org.fossasia.openevent.general.event.Event
 import org.fossasia.openevent.general.event.EventUtils
 import org.fossasia.openevent.general.utils.extensions.nonNull
 import org.fossasia.openevent.general.utils.stripHtml
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.fossasia.openevent.general.utils.Utils.setToolbar
+import org.jetbrains.anko.design.snackbar
 
-class AboutEventFragment : Fragment(), AppBarLayout.OnOffsetChangedListener {
+class AboutEventFragment : Fragment() {
     private lateinit var rootView: View
     private val aboutEventViewModel by viewModel<AboutEventViewModel>()
-    private var isHideToolbarView: Boolean = false
     private lateinit var eventExtra: Event
-    private var title: String = ""
     private val safeArgs: AboutEventFragmentArgs by navArgs()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         rootView = layoutInflater.inflate(R.layout.fragment_about_event, container, false)
 
-        val thisActivity = activity
-        if (thisActivity is AppCompatActivity) {
-            thisActivity.supportActionBar?.title = ""
-            thisActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        }
+        setToolbar(activity)
         setHasOptionsMenu(true)
 
         aboutEventViewModel.event
@@ -50,12 +45,10 @@ class AboutEventFragment : Fragment(), AppBarLayout.OnOffsetChangedListener {
                 loadEvent(it)
             })
 
-        rootView.appBar.addOnOffsetChangedListener(this)
-
         aboutEventViewModel.error
             .nonNull()
             .observe(viewLifecycleOwner, Observer {
-                Snackbar.make(rootView, it, Snackbar.LENGTH_SHORT).show()
+                rootView.snackbar(it)
             })
 
         aboutEventViewModel.progressAboutEvent
@@ -71,30 +64,26 @@ class AboutEventFragment : Fragment(), AppBarLayout.OnOffsetChangedListener {
 
     private fun loadEvent(event: Event) {
         eventExtra = event
-        title = eventExtra.name
         rootView.aboutEventContent.text = event.description?.stripHtml()
         val startsAt = EventUtils.getEventDateTime(event.startsAt, event.timezone)
         val endsAt = EventUtils.getEventDateTime(event.endsAt, event.timezone)
+
         rootView.aboutEventDetails.text = EventUtils.getFormattedDateTimeRangeBulleted(startsAt, endsAt)
         rootView.eventName.text = event.name
-    }
+        Picasso.get()
+            .load(event.originalImageUrl)
+            .placeholder(R.drawable.header)
+            .into(rootView.aboutEventImage)
 
-    override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
-        val maxScroll = appBarLayout.totalScrollRange
-        val percentage = Math.abs(verticalOffset).toFloat() / maxScroll.toFloat()
-
-        if (percentage == 1f && isHideToolbarView) {
-            // Collapsed
-            rootView.detailsHeader.visibility = View.GONE
-            rootView.aboutEventCollapsingLayout.title = title
-            isHideToolbarView = !isHideToolbarView
-        }
-        if (percentage < 1f && !isHideToolbarView) {
-            // Not Collapsed
-            rootView.detailsHeader.visibility = View.VISIBLE
-            rootView.aboutEventCollapsingLayout.title = " "
-            isHideToolbarView = !isHideToolbarView
-        }
+        rootView.appBar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, offset ->
+            if (Math.abs(offset) == appBarLayout.getTotalScrollRange()) {
+                rootView.detailsHeader.isVisible = false
+                setToolbar(activity, event.name)
+            } else {
+                rootView.detailsHeader.isVisible = true
+                setToolbar(activity)
+            }
+        })
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

app/src/main/java/org/fossasia/openevent/general/about/AboutEventFragment.kt

@@ -6,12 +6,14 @@ import androidx.lifecycle.ViewModel
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
+import org.fossasia.openevent.general.R
 import org.fossasia.openevent.general.common.SingleLiveEvent
+import org.fossasia.openevent.general.data.Resource
 import org.fossasia.openevent.general.event.Event
 import org.fossasia.openevent.general.event.EventService
 import timber.log.Timber
 
-class AboutEventViewModel(private val eventService: EventService) : ViewModel() {
+class AboutEventViewModel(private val eventService: EventService, private val resource: Resource) : ViewModel() {
 
     private val compositeDisposable = CompositeDisposable()
 
@@ -24,7 +26,7 @@ class AboutEventViewModel(private val eventService: EventService) : ViewModel()
 
     fun loadEvent(id: Long) {
         if (id.equals(-1)) {
-            mutableError.value = "Error fetching event"
+            mutableError.value = Resource().getString(R.string.error_fetching_event_message)
             return
         }
         compositeDisposable.add(eventService.getEvent(id)
@@ -37,7 +39,7 @@ class AboutEventViewModel(private val eventService: EventService) : ViewModel()
             }.subscribe({ eventList ->
                 mutableEvent.value = eventList
             }, {
-                mutableError.value = "Error fetching event"
+                mutableError.value = resource.getString(R.string.error_fetching_event_message)
                 Timber.e(it, "Error fetching event %d", id)
             })
         )