-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #49 from Omega-R/develop
Develop
- Loading branch information
Showing
22 changed files
with
592 additions
and
85 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
10 changes: 0 additions & 10 deletions
10
annotations/src/main/java/com/omega_r/base/annotations/AutoPresenterLauncher.kt
This file was deleted.
Oops, something went wrong.
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
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,17 @@ | ||
| package com.omega_r.base.simple | ||
|
|
||
| import com.omega_r.base.settings.BaseSettings | ||
| import com.omega_r.base.settings.SettingStorage | ||
| import com.squareup.moshi.Moshi | ||
| import com.squareup.moshi.adapter | ||
|
|
||
| class Settings(setting: SettingStorage, moshi: Moshi): BaseSettings(setting) { | ||
|
|
||
| var firstLaunch by provideBoolean(key = "jklh", defaultValue = false, label = "possim") | ||
|
|
||
| @OptIn(ExperimentalStdlibApi::class) | ||
| var session: Session? by provideAnyJson(key = "", defaultValue = null, label = "sdf", moshi.adapter()) | ||
|
|
||
| class Session(val token: String, val refreshToken: String) | ||
|
|
||
| } |
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
2 changes: 0 additions & 2 deletions
2
app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogPresenter.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 |
|---|---|---|
| @@ -1,12 +1,10 @@ | ||
| package com.omega_r.base.simple.dialog_fragment | ||
|
|
||
| import com.omega_r.base.mvp.presenters.OmegaPresenter | ||
| import com.omegar.mvp.InjectViewState | ||
|
|
||
| /** | ||
| * Created by Anton Knyazev on 10.03.2020. | ||
| */ | ||
| @InjectViewState | ||
| class DialogPresenter : OmegaPresenter<DialogView>() { | ||
|
|
||
| } |
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
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
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,92 @@ | ||
| package com.omega_r.base.enitity | ||
|
|
||
| import com.omega_r.base.enitity.Percent.Companion.DEFAULT_PERCENT_MODEL | ||
| import com.omega_r.base.enitity.Percent.Companion.FLOAT_PERCENT_MODEL | ||
| import java.io.Serializable | ||
|
|
||
| /** | ||
| * Created by Anton Knyazev on 20.07.2023. | ||
| * Copyright (c) 2023 Omega https://omega-r.com | ||
| */ | ||
| @JvmInline | ||
| value class Percent private constructor(private val value: Float): Serializable { | ||
|
|
||
| companion object { | ||
|
|
||
| val FLOAT_PERCENT_MODEL = PercentModel(0f, 1f) | ||
|
|
||
| val DEFAULT_PERCENT_MODEL = PercentModel(0, 100) | ||
|
|
||
| val MAX = Percent(1.0f) | ||
| val MIN = Percent(0.0f) | ||
|
|
||
| fun calc(current: Number, max: Number): Percent = (current.toFloat() / max.toFloat()).toPercent(FLOAT_PERCENT_MODEL) | ||
|
|
||
| } | ||
|
|
||
| constructor(value: Float, model: PercentModel) : this(value, model.min, model.max) | ||
|
|
||
|
|
||
| constructor(value: Number, min: Number, max: Number): this(value.toFloat(), min.toFloat(), max.toFloat()) | ||
|
|
||
| constructor(value: Float, min: Float, max: Float) : this( | ||
| when { | ||
| value < min -> MIN.value | ||
| value > max -> MAX.value | ||
| else -> (value - min) / (max - min) | ||
| } | ||
| ) | ||
|
|
||
| fun toInt(model: PercentModel = DEFAULT_PERCENT_MODEL): Int = toFloat(model).toInt() | ||
|
|
||
| fun toInt(min: Int, max: Int): Int = toFloat(min.toFloat(), max.toFloat()).toInt() | ||
|
|
||
| fun toFloat(model: PercentModel = FLOAT_PERCENT_MODEL): Float = toFloat(model.min, model.max) | ||
|
|
||
| fun toFloat(min: Float, max: Float): Float = when { | ||
| value > MAX.value -> max | ||
| value < MIN.value -> min | ||
| else -> value * (max - min) + min | ||
| } | ||
|
|
||
| fun isMin() = value <= MIN.value | ||
|
|
||
| fun isMax() = value >= MAX.value | ||
|
|
||
| operator fun compareTo(percent: Percent): Int { | ||
| return value.compareTo(percent.value) | ||
| } | ||
|
|
||
| operator fun times(number: Number): Percent = Percent(value * number.toFloat()) | ||
|
|
||
| operator fun div(number: Number): Percent = Percent(value / number.toFloat()) | ||
|
|
||
| operator fun times(percent: Percent): Percent = Percent(value * percent.value) | ||
|
|
||
| operator fun div(percent: Percent): Percent = Percent(value / percent.value) | ||
|
|
||
| operator fun plus(percent: Percent): Percent = Percent(value + percent.value) | ||
|
|
||
| operator fun minus(percent: Percent): Percent = Percent(value - percent.value) | ||
|
|
||
| override fun toString(): String = "${value * 100}%" | ||
|
|
||
| } | ||
|
|
||
| data class PercentModel(val min: Float, val max: Float) { | ||
| constructor(min: Number, max: Number) : this(min.toFloat(), max.toFloat()) | ||
| } | ||
|
|
||
| fun Number.toPercent(model: PercentModel) = Percent(toFloat(), model) | ||
|
|
||
| fun Double.toPercent(model: PercentModel = FLOAT_PERCENT_MODEL) = Percent(toFloat(), model) | ||
|
|
||
| fun Int.toPercent(model: PercentModel = DEFAULT_PERCENT_MODEL) = Percent(toFloat(), model) | ||
|
|
||
| fun Long.toPercent(model: PercentModel = DEFAULT_PERCENT_MODEL) = Percent(toFloat(), model) | ||
|
|
||
| fun Number.toPercent(min: Number, max: Number) = Percent(this, min, max) | ||
|
|
||
| fun Float.toPercent(model: PercentModel = FLOAT_PERCENT_MODEL) = Percent(this, model) | ||
|
|
||
| fun Float.toPercent(min: Float, max: Float) = Percent(this, min, max) |
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
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
3 changes: 2 additions & 1 deletion
3
core/src/main/java/com/omega_r/base/mvp/views/OmegaBindView.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 |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| package com.omega_r.base.mvp.views | ||
|
|
||
| import com.omegar.mvp.viewstate.strategy.MoxyViewCommand | ||
| import com.omegar.mvp.viewstate.strategy.StateStrategyType | ||
| import com.omegar.mvp.viewstate.strategy.StrategyType | ||
|
|
||
| interface OmegaBindView<M>: OmegaView { | ||
|
|
||
| @StateStrategyType(StrategyType.ADD_TO_END_SINGLE) | ||
| @MoxyViewCommand(StrategyType.ADD_TO_END_SINGLE) | ||
| fun bind(item: M) | ||
|
|
||
| } |
Oops, something went wrong.