-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/ALTAPPS-1034/shared_customizable_challenges' in…
…to feature/ALTAPPS-1035/ios_customizable_challenges
- Loading branch information
Showing
85 changed files
with
1,993 additions
and
466 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...App/src/main/java/org/hyperskill/app/android/core/extensions/LayerListDrawableDelegate.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package org.hyperskill.app.android.core.extensions | ||
|
|
||
| import android.graphics.drawable.LayerDrawable | ||
|
|
||
| class LayerListDrawableDelegate( | ||
| private val layerIds: List<Int>, | ||
| private val layers: LayerDrawable | ||
| ) { | ||
| fun showLayer(visibleLayerId: Int) { | ||
| for (layerId in layerIds) { | ||
| val layer = layers.findDrawableByLayerId(layerId).mutate() | ||
| layer.alpha = | ||
| if (layerId == visibleLayerId) 255 else 0 | ||
| layers.setDrawableByLayerId(layerId, layer) | ||
| layers.invalidateSelf() | ||
| } | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
androidHyperskillApp/src/main/java/org/hyperskill/app/android/core/extensions/ShareUtils.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package org.hyperskill.app.android.core.extensions | ||
|
|
||
| import android.content.ClipData | ||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.graphics.Bitmap | ||
| import android.graphics.BitmapFactory | ||
| import android.net.Uri | ||
| import androidx.annotation.DrawableRes | ||
| import androidx.core.content.FileProvider | ||
| import java.io.File | ||
| import java.io.FileOutputStream | ||
| import org.hyperskill.app.android.BuildConfig | ||
| import org.hyperskill.app.android.HyperskillApp | ||
|
|
||
| object ShareUtils { | ||
| fun getShareDrawableIntent( | ||
| context: Context, | ||
| @DrawableRes drawableRes: Int, | ||
| text: String, | ||
| title: String | ||
| ): Intent { | ||
| val shareIntent = Intent().apply { | ||
| val bitmap = BitmapFactory.decodeResource(context.resources, drawableRes) | ||
|
|
||
| val originImageUri = getUriForBitmap(context, bitmap, "$drawableRes.png") | ||
|
|
||
| action = Intent.ACTION_SEND | ||
| putExtra(Intent.EXTRA_STREAM, originImageUri) | ||
| addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) | ||
| putExtra(Intent.EXTRA_TEXT, text) | ||
| clipData = ClipData.newRawUri(null, originImageUri) | ||
| type = "image/*" | ||
| } | ||
| return Intent.createChooser( | ||
| shareIntent, | ||
| title | ||
| ) | ||
| } | ||
|
|
||
| private fun getUriForBitmap( | ||
| context: Context, | ||
| bitmap: Bitmap, | ||
| name: String | ||
| ): Uri { | ||
| val file = File(context.cacheDir, name).apply { | ||
| createNewFile() | ||
| } | ||
| FileOutputStream(file).use { stream -> | ||
| bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream) | ||
| } | ||
| return FileProvider.getUriForFile( | ||
| HyperskillApp.getAppContext(), | ||
| "${BuildConfig.APPLICATION_ID}.provider", | ||
| file | ||
| ) | ||
| } | ||
| } |
96 changes: 96 additions & 0 deletions
96
...c/main/java/org/hyperskill/app/android/share_streak/fragment/ShareStreakDialogFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package org.hyperskill.app.android.share_streak.fragment | ||
|
|
||
| import android.app.Dialog | ||
| import android.content.DialogInterface | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.annotation.DrawableRes | ||
| import by.kirich1409.viewbindingdelegate.viewBinding | ||
| import coil.load | ||
| import coil.transform.RoundedCornersTransformation | ||
| import com.google.android.material.bottomsheet.BottomSheetBehavior | ||
| import com.google.android.material.bottomsheet.BottomSheetDialog | ||
| import com.google.android.material.bottomsheet.BottomSheetDialogFragment | ||
| import org.hyperskill.app.android.R | ||
| import org.hyperskill.app.android.databinding.FragmentShareStreakBinding | ||
| import org.hyperskill.app.android.view.base.ui.extension.wrapWithTheme | ||
| import ru.nobird.android.view.base.ui.extension.argument | ||
|
|
||
| class ShareStreakDialogFragment : BottomSheetDialogFragment() { | ||
|
|
||
| companion object { | ||
| const val TAG = "ShareStreakBottomSheetTag" | ||
|
|
||
| fun newInstance( | ||
| streak: Int, | ||
| @DrawableRes imageRes: Int | ||
| ): ShareStreakDialogFragment = | ||
| ShareStreakDialogFragment().apply { | ||
| this.streak = streak | ||
| this.imageRes = imageRes | ||
| } | ||
| } | ||
|
|
||
| private var streak: Int by argument() | ||
| @get:DrawableRes | ||
| private var imageRes: Int by argument() | ||
|
|
||
| private val binding: FragmentShareStreakBinding by viewBinding(FragmentShareStreakBinding::bind) | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setStyle(STYLE_NORMAL, R.style.TopCornersRoundedBottomSheetDialog) | ||
| } | ||
|
|
||
| override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = | ||
| BottomSheetDialog(requireContext(), theme).also { dialog -> | ||
| dialog.setOnShowListener { | ||
| dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED | ||
| if (savedInstanceState == null) { | ||
| (parentFragment as? Callback)?.onShareStreakBottomSheetShown(streak) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun onDismiss(dialog: DialogInterface) { | ||
| (parentFragment as? Callback)?.onShareStreakBottomSheetDismissed(streak) | ||
| } | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View? = | ||
| inflater.wrapWithTheme(requireActivity()) | ||
| .inflate(R.layout.fragment_share_streak, container, false) | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| with(binding) { | ||
| shareStreakImage.load(imageRes) { | ||
| transformations( | ||
| RoundedCornersTransformation( | ||
| requireContext().resources.getDimension(R.dimen.corner_radius) | ||
| ) | ||
| ) | ||
| } | ||
| shareStreakShareButton.setOnClickListener { | ||
| (parentFragment as? Callback)?.onShareClick(streak) | ||
| } | ||
| shareStreakRefuseButton.setOnClickListener { | ||
| (parentFragment as? Callback)?.onRefuseStreakSharingClick(streak) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| interface Callback { | ||
| fun onShareStreakBottomSheetShown(streak: Int) | ||
|
|
||
| fun onShareStreakBottomSheetDismissed(streak: Int) | ||
|
|
||
| fun onShareClick(streak: Int) | ||
|
|
||
| fun onRefuseStreakSharingClick(streak: Int) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.