Skip to content

Commit

Permalink
resolving conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
rishabh-997 committed Jun 1, 2020
1 parent d9c3f5c commit e56d91a
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 119 deletions.
7 changes: 1 addition & 6 deletions openmrs-client/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,7 @@
android:parentActivityName=".activities.providermanagerdashboard.ProviderManagerDashboardActivity"
android:theme="@style/AppThemeOrig" />

<activity
android:name=".activities.community.contact.ContactUsActivity"
android:theme="@style/AppThemeOrig"
android:label="@string/contact_us"/>

<meta-data
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="${GOOGLE_PLACE_API_KEY}"/>
</application>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import com.google.android.material.snackbar.Snackbar;

import org.openmrs.mobile.R;
import org.openmrs.mobile.activities.community.contact.ContactUsActivity;
import org.openmrs.mobile.activities.dialog.CustomFragmentDialog;
import org.openmrs.mobile.activities.introduction.SplashActivity;
import org.openmrs.mobile.activities.login.LoginActivity;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* The contents of this file are subject to the OpenMRS Public License
* Version 1.0 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://license.openmrs.org
*
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
* under the License.
*
* Copyright (C) OpenMRS, LLC. All Rights Reserved.
*/
package org.openmrs.mobile.activities.community.contact

import android.content.ActivityNotFoundException
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import org.openmrs.mobile.R
import org.openmrs.mobile.activities.ACBaseActivity
import org.openmrs.mobile.databinding.ActvityContactUsBinding
import org.openmrs.mobile.utilities.ToastUtil

class ContactUsActivity : ACBaseActivity(), ContactUsContract.View {

var presenter: ContactUsContract.Presenter? = null
private lateinit var binding: ActvityContactUsBinding

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActvityContactUsBinding.inflate(layoutInflater)
setContentView(binding.root)
presenter = ContactUsPresenter()

val actionBar = supportActionBar
if (actionBar != null) {
actionBar.elevation = 0f
actionBar.setDisplayHomeAsUpEnabled(true)
}

binding.contactEmailButton.setOnClickListener {
val sendMailIntent = Intent(Intent.ACTION_SENDTO)
val mailTo = "mailto:" + binding.contactEmailText.text.toString()
sendMailIntent.data = Uri.parse(mailTo)
try {
startActivity(sendMailIntent)
} catch (ex: ActivityNotFoundException) {
ToastUtil.showShortToast(this, ToastUtil.ToastType.ERROR, getString(R.string.no_mailing_client_found))
}
}

binding.talksButton.setOnClickListener {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.contact_forum_url)))
startActivity(intent)
}

binding.ircButton.setOnClickListener {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.contact_irc_url)))
startActivity(intent)
}
}

override fun onCreateOptionsMenu(menu: Menu): Boolean {
super.onCreateOptionsMenu(menu)
//Disable Contact Option in Menu
val contactItem = menu.findItem(R.id.actionContact)
contactItem.isVisible = false
val logOutItem = menu.findItem(R.id.actionLogout)
logOutItem.isVisible = false
val locationItem = menu.findItem(R.id.actionLocation)
locationItem.isVisible = false
val settingItem = menu.findItem(R.id.actionSettings)
settingItem.isVisible = false
return true
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (item.itemId == android.R.id.home) {
finish()
return true
}
return super.onOptionsItemSelected(item)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@
* Copyright (C) OpenMRS, LLC. All Rights Reserved.
*/

package org.openmrs.mobile.activities.community.contact;
package org.openmrs.mobile.activities.community.contact

public class ContactUsContract {
interface View {
}

interface Presenter {
}
}
class ContactUsContract {
interface View
interface Presenter
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@
* Copyright (C) OpenMRS, LLC. All Rights Reserved.
*/

package org.openmrs.mobile.activities.community.contact;
package org.openmrs.mobile.activities.community.contact

public class ContactUsPresenter implements ContactUsContract.Presenter {
ContactUsContract.View contactUsView;

public ContactUsPresenter(ContactUsContract.View contactUsView) {
this.contactUsView = contactUsView;
}
}
class ContactUsPresenter : ContactUsContract.Presenter
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@

import org.openmrs.mobile.R;
import org.openmrs.mobile.activities.ACBaseFragment;
import org.openmrs.mobile.activities.community.contact.ContactUsActivity;
import org.openmrs.mobile.activities.dashboard.DashboardActivity;
import org.openmrs.mobile.activities.dialog.CustomFragmentDialog;
import org.openmrs.mobile.api.FormListService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@

import org.openmrs.mobile.R;
import org.openmrs.mobile.activities.ACBaseFragment;
import org.openmrs.mobile.activities.community.contact.ContactUsActivity;
import org.openmrs.mobile.activities.logs.LogsActivity;
import org.openmrs.mobile.services.ConceptDownloadService;
import org.openmrs.mobile.utilities.ApplicationConstants;
Expand Down

0 comments on commit e56d91a

Please sign in to comment.