Skip to content

Commit

Permalink
refactor: move extension modules into common submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
tynn committed Jun 11, 2021
1 parent 8ed6c6f commit 6fff2e9
Show file tree
Hide file tree
Showing 79 changed files with 36 additions and 36 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion example/common/build.gradle → example/base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ android {
}

dependencies {
api project(':material')
api project(':extension:material')
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="xyz.tynn.astring.example.common">
package="xyz.tynn.astring.example.base">

<application
android:allowBackup="false"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2020 Christian Schmitz
// SPDX-License-Identifier: Apache-2.0

package xyz.tynn.astring.example.common
package xyz.tynn.astring.example.base

import xyz.tynn.astring.*

Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion example/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

dependencies {
implementation project(':example:common'), {
implementation project(':example:base'), {
exclude group: 'org.jetbrains.kotlin'
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import xyz.tynn.astring.appcompat.AStringAlertDialog;
import xyz.tynn.astring.appcompat.AStringAlertDialogBuilder;
import xyz.tynn.astring.core.AStringToast;
import xyz.tynn.astring.example.common.AStringsKt;
import xyz.tynn.astring.example.common.R;
import xyz.tynn.astring.example.common.databinding.ActivityMainBinding;
import xyz.tynn.astring.example.base.AStringsKt;
import xyz.tynn.astring.example.base.R;
import xyz.tynn.astring.example.base.databinding.ActivityMainBinding;
import xyz.tynn.astring.material.AStringSnackbar;

import static android.content.DialogInterface.BUTTON_NEGATIVE;
Expand All @@ -40,23 +40,23 @@
import static xyz.tynn.astring.core.AStringView.setContentDescription;
import static xyz.tynn.astring.core.AStringView.setStateDescription;
import static xyz.tynn.astring.core.AStringView.setTooltipText;
import static xyz.tynn.astring.example.common.AStringsKt.getAString;
import static xyz.tynn.astring.example.common.AStringsKt.getAccessibilityPaneTitle;
import static xyz.tynn.astring.example.common.AStringsKt.getAction1;
import static xyz.tynn.astring.example.common.AStringsKt.getAction2;
import static xyz.tynn.astring.example.common.AStringsKt.getAction3;
import static xyz.tynn.astring.example.common.AStringsKt.getAppend;
import static xyz.tynn.astring.example.common.AStringsKt.getAppendRange;
import static xyz.tynn.astring.example.common.AStringsKt.getContentDescription;
import static xyz.tynn.astring.example.common.AStringsKt.getDialog;
import static xyz.tynn.astring.example.common.AStringsKt.getError;
import static xyz.tynn.astring.example.common.AStringsKt.getErrorIcon;
import static xyz.tynn.astring.example.common.AStringsKt.getHint;
import static xyz.tynn.astring.example.common.AStringsKt.getMessage;
import static xyz.tynn.astring.example.common.AStringsKt.getStateDescription;
import static xyz.tynn.astring.example.common.AStringsKt.getTextType;
import static xyz.tynn.astring.example.common.AStringsKt.getTooltipText;
import static xyz.tynn.astring.example.common.databinding.ActivityMainBinding.inflate;
import static xyz.tynn.astring.example.base.AStringsKt.getAString;
import static xyz.tynn.astring.example.base.AStringsKt.getAccessibilityPaneTitle;
import static xyz.tynn.astring.example.base.AStringsKt.getAction1;
import static xyz.tynn.astring.example.base.AStringsKt.getAction2;
import static xyz.tynn.astring.example.base.AStringsKt.getAction3;
import static xyz.tynn.astring.example.base.AStringsKt.getAppend;
import static xyz.tynn.astring.example.base.AStringsKt.getAppendRange;
import static xyz.tynn.astring.example.base.AStringsKt.getContentDescription;
import static xyz.tynn.astring.example.base.AStringsKt.getDialog;
import static xyz.tynn.astring.example.base.AStringsKt.getError;
import static xyz.tynn.astring.example.base.AStringsKt.getErrorIcon;
import static xyz.tynn.astring.example.base.AStringsKt.getHint;
import static xyz.tynn.astring.example.base.AStringsKt.getMessage;
import static xyz.tynn.astring.example.base.AStringsKt.getStateDescription;
import static xyz.tynn.astring.example.base.AStringsKt.getTextType;
import static xyz.tynn.astring.example.base.AStringsKt.getTooltipText;
import static xyz.tynn.astring.example.base.databinding.ActivityMainBinding.inflate;
import static xyz.tynn.astring.material.AStringSnackbar.make;
import static xyz.tynn.astring.material.AStringSnackbar.setAction;

Expand Down
2 changes: 1 addition & 1 deletion example/kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ plugins {
}

dependencies {
implementation project(':example:common')
implementation project(':example:base')
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
import com.google.android.material.snackbar.Snackbar.make
import xyz.tynn.astring.appcompat.*
import xyz.tynn.astring.core.*
import xyz.tynn.astring.example.common.*
import xyz.tynn.astring.example.common.databinding.ActivityMainBinding
import xyz.tynn.astring.example.common.databinding.ActivityMainBinding.inflate
import xyz.tynn.astring.example.base.*
import xyz.tynn.astring.example.base.databinding.ActivityMainBinding
import xyz.tynn.astring.example.base.databinding.ActivityMainBinding.inflate
import xyz.tynn.astring.getValue
import xyz.tynn.astring.material.makeSnackbar
import xyz.tynn.astring.material.setAction
Expand Down Expand Up @@ -64,12 +64,12 @@ class MainActivity : AppCompatActivity() {
.setNegativeButton(action3, null)
.setMessage(message)
.create()
.apply { setTitle(xyz.tynn.astring.example.common.title) }
.apply { setTitle(xyz.tynn.astring.example.base.title) }
.show()
}
buttonAlertDialogLegacy.setOnClickListener {
AlertDialog.Builder(this@MainActivity)
.setTitle(xyz.tynn.astring.example.common.title)
.setTitle(xyz.tynn.astring.example.base.title)
.setMessage(message)
.setPositiveButton(action1, null)
.setNeutralButton(action2, null)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

dependencies {
api project(':core')
api project(':extension:core')
api 'androidx.appcompat:appcompat:1.3.0'

testImplementation project(':testing')
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion material/build.gradle → extension/material/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

dependencies {
api project(':appcompat')
api project(':extension:appcompat')
api 'com.google.android.material:material:1.3.0'

testImplementation project(':testing')
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ include ':bom'
include ':astring'
include ':testing'

include ':core'
include ':appcompat'
include ':material'
include ':extension:core'
include ':extension:appcompat'
include ':extension:material'

include ':example:common'
include ':example:base'
include ':example:java'
include ':example:kotlin'

0 comments on commit 6fff2e9

Please sign in to comment.