Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 8269472

Browse files
y9san9y9san9
committed
close #9;
Also: excluded gradlew from .gitignore, moved some stuff in build.gradle.kts
1 parent 0ae1182 commit 8269472

19 files changed

+366
-29
lines changed

‎.gitignore

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
*.iml
22
.gradle
3-
/local.properties
4-
/.idea
3+
build
4+
local.properties
5+
.idea
56
.DS_Store
6-
/build
77
/captures
88
.externalNativeBuild
99
.cxx
10-
local.properties
11-
/gradlew
12-
/gradlew.bat
13-
/buildSrc/build
14-
/app/build
15-
/.gradle
16-
/deploy.properties
10+
/deploy.properties

‎app/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
applicationId = "${ApplicationConfig.PACKAGE}.app"
1212
minSdk = ApplicationConfig.MIN_SDK_VERSION
1313
targetSdk = ApplicationConfig.TARGET_SDK_VERSION
14-
versionCode = Version.APPLICATION_VERSION_INT
15-
versionName = Version.APPLICATION_VERSION_NAME
14+
versionCode = ApplicationConfig.APPLICATION_VERSION_INT
15+
versionName = ApplicationConfig.APPLICATION_VERSION_NAME
1616

1717
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1818
vectorDrawables {
@@ -53,8 +53,10 @@ dependencies {
5353
implementation(composeUITooling)
5454
implementation(androidxLifecycle)
5555
implementation(activityCompose)
56-
testImplementation(jUnit)
57-
androidTestImplementation(composeJUNIT)
5856
implementation(codeeCore)
5957
implementation(scriptingDependencies)
58+
implementation(coroutines)
59+
60+
testImplementation(jUnit)
61+
androidTestImplementation(composeJUNIT)
6062
}

‎app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="me.neon.codee">
3+
package="com.codee">
44

55
<application
6-
android:name=".CodeeApplication"
76
android:allowBackup="true"
87
android:icon="@mipmap/ic_launcher"
98
android:label="@string/app_name"
109
android:roundIcon="@mipmap/ic_launcher_round"
1110
android:supportsRtl="true"
12-
android:theme="@style/Theme.Codee">
11+
android:theme="@style/Theme.Codee"
12+
android:fullBackupContent="@xml/backup_descriptor">
1313
<activity
14-
android:name=".MainActivity"
14+
android:name=".app.MainActivity"
1515
android:exported="true"
1616
android:label="@string/app_name"
1717
android:theme="@style/Theme.Codee.NoActionBar">

‎app/src/main/java/com/codee/app/MainActivity.kt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.codee.app
2+
3+
import android.os.Bundle
4+
import androidx.activity.ComponentActivity
5+
import androidx.activity.compose.setContent
6+
import com.codee.app.strings.RuStrings
7+
import com.codee.app.strings.Strings
8+
import kotlinx.coroutines.DelicateCoroutinesApi
9+
import kotlinx.coroutines.GlobalScope
10+
import kotlinx.coroutines.delay
11+
import kotlinx.coroutines.launch
12+
13+
14+
class MainActivity : ComponentActivity() {
15+
@DelicateCoroutinesApi
16+
override fun onCreate(savedInstanceState: Bundle?) {
17+
super.onCreate(savedInstanceState)
18+
19+
setContent {
20+
StringsComposable()
21+
}
22+
23+
GlobalScope.launch {
24+
delay(timeMillis = 2000)
25+
Strings.value = RuStrings
26+
}
27+
}
28+
}

‎app/src/main/java/com/codee/app/StringsComposable.kt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.codee.app
2+
3+
import androidx.compose.foundation.layout.IntrinsicSize
4+
import androidx.compose.foundation.layout.height
5+
import androidx.compose.foundation.layout.width
6+
import androidx.compose.material.Text
7+
import androidx.compose.runtime.Composable
8+
import androidx.compose.runtime.getValue
9+
import androidx.compose.runtime.remember
10+
import androidx.compose.ui.Modifier
11+
import androidx.compose.ui.graphics.Color
12+
import com.codee.app.strings.Strings
13+
14+
15+
@Composable
16+
fun StringsComposable() {
17+
val strings by remember { Strings }
18+
19+
Text (
20+
text = strings.hello,
21+
modifier = Modifier.width(IntrinsicSize.Max).height(IntrinsicSize.Max),
22+
color = Color.White
23+
)
24+
}

‎app/src/main/java/com/codee/app/strings/DefaultStrings.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.codee.app.strings
2+
3+
4+
object DefaultStrings : IStrings

‎app/src/main/java/com/codee/app/strings/IStrings.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.codee.app.strings
2+
3+
4+
interface IStrings {
5+
val hello get() = "Hello"
6+
}

‎app/src/main/java/com/codee/app/strings/RuStrings.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.codee.app.strings
2+
3+
4+
object RuStrings : IStrings {
5+
override val hello = "Привет"
6+
}

‎app/src/main/java/com/codee/app/strings/Strings.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.codee.app.strings
2+
3+
import androidx.compose.runtime.MutableState
4+
import androidx.compose.runtime.mutableStateOf
5+
6+
7+
object Strings : MutableState<IStrings> by mutableStateOf(DefaultStrings)

‎app/src/main/res/xml/backup_descriptor.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<full-backup-content>
3+
<!-- Exclude specific shared preferences that contain GCM registration Id -->
4+
</full-backup-content>

‎build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ buildscript {
66
dependencies {
77
classpath(androidBuildTools)
88
classpath(kotlinGradlePlugin)
9-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10")
109
}
1110
}
1211

1312
tasks.register("clean", Delete::class) {
1413
delete(rootProject.buildDir)
1514
}
16-

‎buildSrc/src/main/kotlin/ApplicationConfig.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
object ApplicationConfig {
44
const val PACKAGE = "com.codee"
5+
6+
const val APPLICATION_VERSION_INT = 1
7+
const val APPLICATION_VERSION_NAME = "1.0.1"
8+
59
const val MIN_SDK_VERSION = 21
610
const val TARGET_SDK_VERSION = 30
711
const val BUILD_TOOLS_VERSION = "30.0.3"
8-
}
12+
}

‎buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import org.gradle.kotlin.dsl.DependencyHandlerScope
66
import org.gradle.kotlin.dsl.kotlin
77
import org.gradle.kotlin.dsl.project
88

9+
10+
val DependencyHandlerScope.coroutines: String
11+
get() = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.COROUTINES}"
12+
913
val DependencyHandlerScope.androidKtCore: String
1014
get() = "androidx.core:core-ktx:1.5.0"
1115

‎buildSrc/src/main/kotlin/Projects.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fun Project.coreDeploy() {
2929
libraryArtifactId = "core"
3030
libraryComponents = "release"
3131
libraryGroup = ApplicationConfig.PACKAGE
32-
libraryVersion = Version.APPLICATION_VERSION_NAME
32+
libraryVersion = ApplicationConfig.APPLICATION_VERSION_NAME
3333
deployTaskName = "release"
3434
}
3535
}

‎buildSrc/src/main/kotlin/Version.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Version {
2-
const val COMPOSE = "1.0.0-beta08"
3-
const val APPLICATION_VERSION_INT = 1
4-
const val APPLICATION_VERSION_NAME = "1.0.1"
52
const val KOTLIN = "1.5.10"
6-
}
3+
4+
const val COROUTINES = "1.5.0"
5+
const val COMPOSE = "1.0.0-beta08"
6+
}

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
4+
zipStorePath=wrapper/dists
45
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
#!/usr/bin/env sh
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
26+
27+
APP_NAME="Gradle"
28+
APP_BASE_NAME=`basename "$0"`
29+
30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
33+
# Use the maximum available, or set MAX_FD != -1 to use that value.
34+
MAX_FD="maximum"
35+
36+
warn () {
37+
echo "$*"
38+
}
39+
40+
die () {
41+
echo
42+
echo "$*"
43+
echo
44+
exit 1
45+
}
46+
47+
# OS specific support (must be 'true' or 'false').
48+
cygwin=false
49+
msys=false
50+
darwin=false
51+
nonstop=false
52+
case "`uname`" in
53+
CYGWIN* )
54+
cygwin=true
55+
;;
56+
Darwin* )
57+
darwin=true
58+
;;
59+
MINGW* )
60+
msys=true
61+
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
65+
esac
66+
67+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68+
69+
# Determine the Java command to use to start the JVM.
70+
if [ -n "$JAVA_HOME" ] ; then
71+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72+
# IBM's JDK on AIX uses strange locations for the executables
73+
JAVACMD="$JAVA_HOME/jre/sh/java"
74+
else
75+
JAVACMD="$JAVA_HOME/bin/java"
76+
fi
77+
if [ ! -x "$JAVACMD" ] ; then
78+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79+
80+
Please set the JAVA_HOME variable in your environment to match the
81+
location of your Java installation."
82+
fi
83+
else
84+
JAVACMD="java"
85+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86+
87+
Please set the JAVA_HOME variable in your environment to match the
88+
location of your Java installation."
89+
fi
90+
91+
# Increase the maximum file descriptors if we can.
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93+
MAX_FD_LIMIT=`ulimit -H -n`
94+
if [ $? -eq 0 ] ; then
95+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96+
MAX_FD="$MAX_FD_LIMIT"
97+
fi
98+
ulimit -n $MAX_FD
99+
if [ $? -ne 0 ] ; then
100+
warn "Could not set maximum file descriptor limit: $MAX_FD"
101+
fi
102+
else
103+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104+
fi
105+
fi
106+
107+
# For Darwin, add options to specify how the application appears in the dock
108+
if $darwin; then
109+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110+
fi
111+
112+
# For Cygwin, switch paths to Windows format before running java
113+
if $cygwin ; then
114+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
161+
}
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)