Update formatters versions:

`gjf` 1.7 -> 1.16.0
`ktfmt` 0.23 -> 0.43
`ktlint` 0.41.0 -> 0.48.2
`spotless` 5.11.0 -> 6.18.0

Manual changes :
 Renamed `logged_in` package -> `loggedIn`
 Renamed `logged_out` package -> `loggedOut`
 Renamed `off_game` package -> `offGame`
 Renamed `tic_tac_toe` package -> `ticTacToe`
This commit is contained in:
sergey.smykovskyi
2023-04-26 11:10:08 -07:00
parent a32142834d
commit e696898c9f
335 changed files with 1916 additions and 1752 deletions
@@ -21,9 +21,9 @@ import android.view.LayoutInflater;
import android.view.ViewGroup;
import com.uber.rib.core.InteractorBaseComponent;
import com.uber.rib.core.ViewBuilder;
import com.uber.rib.root.logged_in.LoggedInBuilder;
import com.uber.rib.root.logged_out.LoggedOutBuilder;
import com.uber.rib.root.logged_out.LoggedOutInteractor;
import com.uber.rib.root.loggedIn.LoggedInBuilder;
import com.uber.rib.root.loggedOut.LoggedOutBuilder;
import com.uber.rib.root.loggedOut.LoggedOutInteractor;
import com.uber.rib.tutorial4.R;
import dagger.Binds;
import dagger.BindsInstance;
@@ -19,7 +19,7 @@ import androidx.annotation.Nullable;
import com.uber.rib.core.Bundle;
import com.uber.rib.core.Interactor;
import com.uber.rib.core.RibInteractor;
import com.uber.rib.root.logged_out.LoggedOutInteractor;
import com.uber.rib.root.loggedOut.LoggedOutInteractor;
import javax.inject.Inject;
/** Coordinates Business Logic for {@link RootBuilder.RootScope}. */
@@ -19,11 +19,11 @@ import androidx.annotation.Nullable;
import com.google.common.base.Optional;
import com.jakewharton.rxrelay2.BehaviorRelay;
import com.uber.rib.core.ViewRouter;
import com.uber.rib.root.logged_in.LoggedInActionableItem;
import com.uber.rib.root.logged_in.LoggedInBuilder;
import com.uber.rib.root.logged_in.LoggedInRouter;
import com.uber.rib.root.logged_out.LoggedOutBuilder;
import com.uber.rib.root.logged_out.LoggedOutRouter;
import com.uber.rib.root.loggedIn.LoggedInActionableItem;
import com.uber.rib.root.loggedIn.LoggedInBuilder;
import com.uber.rib.root.loggedIn.LoggedInRouter;
import com.uber.rib.root.loggedOut.LoggedOutBuilder;
import com.uber.rib.root.loggedOut.LoggedOutRouter;
/** Adds and removes children of {@link RootBuilder.RootScope}. */
public class RootRouter extends ViewRouter<RootView, RootInteractor> {
@@ -54,7 +54,9 @@ public abstract class RootWorkflow<TWorkflowReturnType, TDeepLinkModel extends R
return getSteps(rootActionableItem, deepLinkModel);
}
/** @return the model for the workflow. */
/**
* @return the model for the workflow.
*/
public TDeepLinkModel getDeepLinkModel() {
return deepLinkModel;
}
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in;
package com.uber.rib.root.loggedIn;
public interface GameKey {
String gameName();
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in;
package com.uber.rib.root.loggedIn;
import android.view.ViewGroup;
import com.uber.rib.core.ViewRouter;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in;
package com.uber.rib.root.loggedIn;
import com.uber.rib.workflow.core.ActionableItem;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in;
package com.uber.rib.root.loggedIn;
import static java.lang.annotation.RetentionPolicy.CLASS;
@@ -25,12 +25,12 @@ import com.uber.rib.core.InteractorBaseComponent;
import com.uber.rib.core.ViewRouter;
import com.uber.rib.root.RootView;
import com.uber.rib.root.UserName;
import com.uber.rib.root.logged_in.off_game.OffGameBuilder;
import com.uber.rib.root.logged_in.off_game.OffGameInteractor;
import com.uber.rib.root.logged_in.random_winner.RandomWinnerBuilder;
import com.uber.rib.root.logged_in.random_winner.RandomWinnerInteractor;
import com.uber.rib.root.logged_in.tic_tac_toe.TicTacToeBuilder;
import com.uber.rib.root.logged_in.tic_tac_toe.TicTacToeInteractor;
import com.uber.rib.root.loggedIn.offGame.OffGameBuilder;
import com.uber.rib.root.loggedIn.offGame.OffGameInteractor;
import com.uber.rib.root.loggedIn.randomWinner.RandomWinnerBuilder;
import com.uber.rib.root.loggedIn.randomWinner.RandomWinnerInteractor;
import com.uber.rib.root.loggedIn.ticTacToe.TicTacToeBuilder;
import com.uber.rib.root.loggedIn.ticTacToe.TicTacToeInteractor;
import dagger.Binds;
import dagger.BindsInstance;
import dagger.Provides;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in;
package com.uber.rib.root.loggedIn;
import androidx.annotation.Nullable;
import com.uber.rib.core.Bundle;
@@ -21,10 +21,10 @@ import com.uber.rib.core.EmptyPresenter;
import com.uber.rib.core.Interactor;
import com.uber.rib.core.RibInteractor;
import com.uber.rib.root.UserName;
import com.uber.rib.root.logged_in.LoggedInBuilder.LoggedInInternal;
import com.uber.rib.root.logged_in.off_game.OffGameInteractor;
import com.uber.rib.root.logged_in.random_winner.RandomWinnerInteractor;
import com.uber.rib.root.logged_in.tic_tac_toe.TicTacToeInteractor;
import com.uber.rib.root.loggedIn.LoggedInBuilder.LoggedInInternal;
import com.uber.rib.root.loggedIn.offGame.OffGameInteractor;
import com.uber.rib.root.loggedIn.randomWinner.RandomWinnerInteractor;
import com.uber.rib.root.loggedIn.ticTacToe.TicTacToeInteractor;
import java.util.List;
import javax.inject.Inject;
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in;
package com.uber.rib.root.loggedIn;
import android.view.ViewGroup;
import com.uber.rib.core.Router;
import com.uber.rib.core.ViewRouter;
import com.uber.rib.root.logged_in.off_game.OffGameBuilder;
import com.uber.rib.root.logged_in.off_game.OffGameRouter;
import com.uber.rib.root.logged_in.tic_tac_toe.TicTacToeBuilder;
import com.uber.rib.root.loggedIn.offGame.OffGameBuilder;
import com.uber.rib.root.loggedIn.offGame.OffGameRouter;
import com.uber.rib.root.loggedIn.ticTacToe.TicTacToeBuilder;
/** Adds and removes children of {@link LoggedInBuilder.LoggedInScope}. */
public class LoggedInRouter extends Router<LoggedInInteractor> {
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in;
package com.uber.rib.root.loggedIn;
import com.google.common.collect.ImmutableMap;
import com.jakewharton.rxrelay2.BehaviorRelay;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in;
package com.uber.rib.root.loggedIn;
import com.google.common.collect.ImmutableMap;
import com.uber.rib.root.UserName;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.off_game;
package com.uber.rib.root.loggedIn.offGame;
import static java.lang.annotation.RetentionPolicy.CLASS;
@@ -22,8 +22,8 @@ import android.view.ViewGroup;
import com.uber.rib.core.InteractorBaseComponent;
import com.uber.rib.core.ViewBuilder;
import com.uber.rib.root.UserName;
import com.uber.rib.root.logged_in.GameKey;
import com.uber.rib.root.logged_in.ScoreStream;
import com.uber.rib.root.loggedIn.GameKey;
import com.uber.rib.root.loggedIn.ScoreStream;
import com.uber.rib.tutorial4.R;
import dagger.Binds;
import dagger.BindsInstance;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.off_game;
package com.uber.rib.root.loggedIn.offGame;
import androidx.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
@@ -22,8 +22,8 @@ import com.uber.rib.core.Bundle;
import com.uber.rib.core.Interactor;
import com.uber.rib.core.RibInteractor;
import com.uber.rib.root.UserName;
import com.uber.rib.root.logged_in.GameKey;
import com.uber.rib.root.logged_in.ScoreStream;
import com.uber.rib.root.loggedIn.GameKey;
import com.uber.rib.root.loggedIn.ScoreStream;
import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
import java.util.List;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.off_game;
package com.uber.rib.root.loggedIn.offGame;
import com.uber.rib.core.ViewRouter;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.off_game;
package com.uber.rib.root.loggedIn.offGame;
import android.content.Context;
import android.util.AttributeSet;
@@ -24,7 +24,7 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import com.jakewharton.rxbinding2.view.RxView;
import com.uber.rib.core.Initializer;
import com.uber.rib.root.logged_in.GameKey;
import com.uber.rib.root.loggedIn.GameKey;
import com.uber.rib.tutorial4.R;
import io.reactivex.Observable;
import io.reactivex.functions.Function;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.random_winner;
package com.uber.rib.root.loggedIn.randomWinner;
import static java.lang.annotation.RetentionPolicy.CLASS;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.random_winner;
package com.uber.rib.root.loggedIn.randomWinner;
import androidx.annotation.Nullable;
import com.uber.rib.core.Bundle;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.random_winner;
package com.uber.rib.root.loggedIn.randomWinner;
import com.uber.rib.core.ViewRouter;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.random_winner;
package com.uber.rib.root.loggedIn.randomWinner;
import android.content.Context;
import android.util.AttributeSet;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.tic_tac_toe;
package com.uber.rib.root.loggedIn.ticTacToe;
import javax.inject.Inject;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.tic_tac_toe;
package com.uber.rib.root.loggedIn.ticTacToe;
class BoardCoordinate {
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.tic_tac_toe;
package com.uber.rib.root.loggedIn.ticTacToe;
import static java.lang.annotation.RetentionPolicy.CLASS;
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.tic_tac_toe;
package com.uber.rib.root.loggedIn.ticTacToe;
import androidx.annotation.Nullable;
import com.uber.rib.core.Bundle;
import com.uber.rib.core.Interactor;
import com.uber.rib.core.RibInteractor;
import com.uber.rib.root.UserName;
import com.uber.rib.root.logged_in.tic_tac_toe.Board.MarkerType;
import com.uber.rib.root.loggedIn.ticTacToe.Board.MarkerType;
import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
import javax.inject.Inject;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.tic_tac_toe;
package com.uber.rib.root.loggedIn.ticTacToe;
import com.uber.rib.core.ViewRouter;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_in.tic_tac_toe;
package com.uber.rib.root.loggedIn.ticTacToe;
import android.content.Context;
import android.util.AttributeSet;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_out;
package com.uber.rib.root.loggedOut;
import static java.lang.annotation.RetentionPolicy.CLASS;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_out;
package com.uber.rib.root.loggedOut;
import android.util.Pair;
import androidx.annotation.Nullable;
@@ -21,7 +21,7 @@ import com.uber.rib.core.Bundle;
import com.uber.rib.core.Interactor;
import com.uber.rib.core.RibInteractor;
import com.uber.rib.root.UserName;
import com.uber.rib.root.logged_out.LoggedOutBuilder.LoggedOutScope;
import com.uber.rib.root.loggedOut.LoggedOutBuilder.LoggedOutScope;
import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
import javax.inject.Inject;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_out;
package com.uber.rib.root.loggedOut;
import com.uber.rib.core.ViewRouter;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.uber.rib.root.logged_out;
package com.uber.rib.root.loggedOut;
import android.content.Context;
import android.util.AttributeSet;
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.uber.rib.root.logged_out.LoggedOutView
<com.uber.rib.root.loggedOut.LoggedOutView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -32,4 +32,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"/>
</com.uber.rib.root.logged_out.LoggedOutView>
</com.uber.rib.root.loggedOut.LoggedOutView>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.uber.rib.root.logged_in.off_game.OffGameView
<com.uber.rib.root.loggedIn.offGame.OffGameView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -52,4 +52,4 @@
</LinearLayout>
</com.uber.rib.root.logged_in.off_game.OffGameView>
</com.uber.rib.root.loggedIn.offGame.OffGameView>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.uber.rib.root.logged_in.tic_tac_toe.TicTacToeView
<com.uber.rib.root.loggedIn.ticTacToe.TicTacToeView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tic_tac_toe"
@@ -108,4 +108,4 @@
app:layout_widthPercent="30%"
android:background="#808080"/>
</com.uber.rib.root.logged_in.tic_tac_toe.TicTacToeView>
</com.uber.rib.root.loggedIn.ticTacToe.TicTacToeView>