Skip to content

Commit

Permalink
feat: support for android 10 (#522)
Browse files Browse the repository at this point in the history
  • Loading branch information
@adityastic @iamareebjamal
adityastic authored and iamareebjamal committed Oct 30, 2019
1 parent 9be86cc commit 43229c8
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 73 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

<uses-feature android:name="android.hardware.bluetooth_le" />
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>

<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

<uses-feature android:name="android.hardware.location.gps" />

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/fossasia/badgemagic/ui/DrawerActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,11 @@ class DrawerActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedLi
}

private fun checkManifestPermission() {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
Timber.i { "Coarse permission granted" }
} else {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_PERMISSION_CODE)
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_PERMISSION_CODE)
}
}

Expand Down
159 changes: 90 additions & 69 deletions app/src/main/java/org/fossasia/badgemagic/ui/fragments/TextArtFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ import android.bluetooth.BluetoothAdapter
import android.bluetooth.BluetoothManager
import android.content.Context
import android.content.DialogInterface
import android.content.Intent
import android.content.pm.PackageManager
import android.content.res.Configuration
import android.graphics.Color
import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.VectorDrawable
import android.location.LocationManager
import android.os.AsyncTask
import android.os.Bundle
import android.provider.Settings
import android.text.Editable
import android.text.SpannableStringBuilder
import android.text.TextWatcher
Expand Down Expand Up @@ -67,7 +70,7 @@ class TextArtFragment : BaseFragment() {
private const val REQUEST_PERMISSION_CODE = 10
@JvmStatic
fun newInstance() =
TextArtFragment()
TextArtFragment()
}

private val drawableRecyclerAdapter = DrawableAdapter()
Expand All @@ -93,14 +96,14 @@ class TextArtFragment : BaseFragment() {
override fun getSendData(): DataToSend {
textViewMainText.hideKeyboard()
return SendingUtils.convertToDeviceDataModel(
Message(
Converters.convertEditableToLEDHex(textViewMainText.text.toString(), invertLED.isChecked, viewModel.getClipArts().value
?: SparseArray()),
flash.isChecked,
marquee.isChecked,
Speed.values()[speedKnob.progress.minus(1)],
Mode.values()[modeAdapter.getSelectedItemPosition()]
)
Message(
Converters.convertEditableToLEDHex(textViewMainText.text.toString(), invertLED.isChecked, viewModel.getClipArts().value
?: SparseArray()),
flash.isChecked,
marquee.isChecked,
Speed.values()[speedKnob.progress.minus(1)],
Mode.values()[modeAdapter.getSelectedItemPosition()]
)
)
}

Expand All @@ -118,30 +121,48 @@ class TextArtFragment : BaseFragment() {
transfer_button.setOnClickListener {
if (textViewMainText.text.trim().toString() != "") {
if (BluetoothAdapter.getDefaultAdapter().isEnabled) {
// Easter egg
Toast.makeText(requireContext(), getString(R.string.sending_data), Toast.LENGTH_LONG).show()

transfer_button.visibility = View.GONE
send_progress.visibility = View.VISIBLE

val buttonTimer = Timer()
buttonTimer.schedule(object : TimerTask() {
override fun run() {
activity?.runOnUiThread {
transfer_button.visibility = View.VISIBLE
send_progress.visibility = View.GONE
if (scanLocationPermissions()) {
// Easter egg
Toast.makeText(requireContext(), getString(R.string.sending_data), Toast.LENGTH_LONG).show()

transfer_button.visibility = View.GONE
send_progress.visibility = View.VISIBLE

val buttonTimer = Timer()
buttonTimer.schedule(object : TimerTask() {
override fun run() {
activity?.runOnUiThread {
transfer_button.visibility = View.VISIBLE
send_progress.visibility = View.GONE
}
}
}
}, SCAN_TIMEOUT_MS)
}, SCAN_TIMEOUT_MS)

SendingUtils.sendMessage(requireContext(), getSendData())
SendingUtils.sendMessage(requireContext(), getSendData())
}
} else
showAlertDialog()
} else
Toast.makeText(requireContext(), getString(R.string.empty_text_to_send), Toast.LENGTH_LONG).show()
}
}

private fun scanLocationPermissions(): Boolean {
val lm = requireContext().getSystemService(Context.LOCATION_SERVICE)
if (lm is LocationManager) {
if (lm.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
AlertDialog.Builder(requireContext())
.setMessage(R.string.no_gps_enabled)
.setPositiveButton("OK") { _, _ -> requireContext().startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)) }
.setNegativeButton("Cancel", null)
.show()
return false
}
return true
}
return false
}

private fun startSaveFile() {
textViewMainText.hideKeyboard()
showSaveFileDialog()
Expand All @@ -160,7 +181,7 @@ class TextArtFragment : BaseFragment() {

private fun checkStoragePermission(): Boolean {
return if (ActivityCompat.checkSelfPermission(requireContext(),
android.Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
android.Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(arrayOf(android.Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_PERMISSION_CODE)
false
} else
Expand Down Expand Up @@ -224,10 +245,10 @@ class TextArtFragment : BaseFragment() {
viewModel.showClipart.let {
clipart_layout.visibility = if (it) View.VISIBLE else View.GONE
clipart_handler.setImageResource(
if (it)
R.drawable.ic_clipart_switcher_enabled
else
R.drawable.ic_clipart_switcher_disabled
if (it)
R.drawable.ic_clipart_switcher_enabled
else
R.drawable.ic_clipart_switcher_disabled
)
if (it) textViewMainText.hideKeyboard() else textViewMainText.showKeyboard()
}
Expand Down Expand Up @@ -378,15 +399,15 @@ class TextArtFragment : BaseFragment() {
modeRecyclerView.adapter = null

val listOfAnimations = listOf(
ModeInfo(R.drawable.ic_anim_left, Mode.LEFT),
ModeInfo(R.drawable.ic_anim_right, Mode.RIGHT),
ModeInfo(R.drawable.ic_anim_up, Mode.UP),
ModeInfo(R.drawable.ic_anim_down, Mode.DOWN),
ModeInfo(R.drawable.ic_anim_fixed, Mode.FIXED),
ModeInfo(R.drawable.ic_anim_fixed, Mode.SNOWFLAKE),
ModeInfo(R.drawable.ic_anim_picture, Mode.PICTURE),
ModeInfo(R.drawable.ic_anim_animation, Mode.ANIMATION),
ModeInfo(R.drawable.ic_anim_laser, Mode.LASER)
ModeInfo(R.drawable.ic_anim_left, Mode.LEFT),
ModeInfo(R.drawable.ic_anim_right, Mode.RIGHT),
ModeInfo(R.drawable.ic_anim_up, Mode.UP),
ModeInfo(R.drawable.ic_anim_down, Mode.DOWN),
ModeInfo(R.drawable.ic_anim_fixed, Mode.FIXED),
ModeInfo(R.drawable.ic_anim_fixed, Mode.SNOWFLAKE),
ModeInfo(R.drawable.ic_anim_picture, Mode.PICTURE),
ModeInfo(R.drawable.ic_anim_animation, Mode.ANIMATION),
ModeInfo(R.drawable.ic_anim_laser, Mode.LASER)
)
modeAdapter.addAll(listOfAnimations)
modeAdapter.setSelectedAnimationPosition(viewModel.animationPosition)
Expand Down Expand Up @@ -434,12 +455,12 @@ class TextArtFragment : BaseFragment() {

private fun setPreview() {
preview_badge.setValue(
Converters.convertEditableToLEDHex(textViewMainText.text.toString(), invertLED.isChecked, viewModel.getClipArts().value
?: SparseArray()),
marquee.isChecked,
flash.isChecked,
Speed.values()[speedKnob.progress.minus(1)],
Mode.values()[modeAdapter.getSelectedItemPosition()]
Converters.convertEditableToLEDHex(textViewMainText.text.toString(), invertLED.isChecked, viewModel.getClipArts().value
?: SparseArray()),
marquee.isChecked,
flash.isChecked,
Speed.values()[speedKnob.progress.minus(1)],
Mode.values()[modeAdapter.getSelectedItemPosition()]
)
}

Expand All @@ -454,13 +475,13 @@ class TextArtFragment : BaseFragment() {
saveFileEditText.setText(getCurrentDate())

val alertDialog = AlertDialog.Builder(context)
.setTitle(getString(R.string.save_dialog_title))
.setView(view)
.setPositiveButton(R.string.save_button, null)
.setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
}
.create()
.setTitle(getString(R.string.save_dialog_title))
.setView(view)
.setPositiveButton(R.string.save_button, null)
.setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
}
.create()

alertDialog.setOnShowListener {
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
Expand All @@ -486,29 +507,29 @@ class TextArtFragment : BaseFragment() {

private fun configToJSON(): String {
return SendingUtils.configToJSON(
Message(
Converters.convertEditableToLEDHex(textViewMainText.text.toString(), false, viewModel.getClipArts().value
?: SparseArray()),
flash.isChecked,
marquee.isChecked,
Speed.values()[speedKnob.progress.minus(1)],
Mode.values()[modeAdapter.getSelectedItemPosition()]
),
invertLED.isChecked
Message(
Converters.convertEditableToLEDHex(textViewMainText.text.toString(), false, viewModel.getClipArts().value
?: SparseArray()),
flash.isChecked,
marquee.isChecked,
Speed.values()[speedKnob.progress.minus(1)],
Mode.values()[modeAdapter.getSelectedItemPosition()]
),
invertLED.isChecked
)
}

private fun showFileOverrideDialog(fileName: String, jsonString: String) {
AlertDialog.Builder(context)
.setTitle(context?.getString(R.string.save_dialog_already_present))
.setMessage(context?.getString(R.string.save_dialog_already_present_override))
.setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
saveFile(fileName, jsonString)
}
.setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
}
.show()
.setTitle(context?.getString(R.string.save_dialog_already_present))
.setMessage(context?.getString(R.string.save_dialog_already_present_override))
.setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
saveFile(fileName, jsonString)
}
.setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
}
.show()
}

private fun saveFile(fileName: String, jsonString: String) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,5 @@
<string name="clipart_saved_success">ClipArt已成功保存</string>
<string name="clipart_saved_error">保存剪贴画时出错</string>
<string name="drawer_saved_cliparts">保存的教具</string>
<string name="no_gps_enabled">找不到GPS，请从设置中启用GPS</string>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,5 @@
<string name="clipart_saved_success">ClipArt Saved Successfully</string>
<string name="clipart_saved_error">Error in saving Clipart</string>
<string name="drawer_saved_cliparts">Saved Cliparts</string>
<string name="no_gps_enabled">No GPS Found, Please Enable GPS from Settings</string>
</resources>

0 comments on commit 43229c8

Please sign in to comment.