Skip to content
Snippets Groups Projects
Commit 58982185 authored by Florian's avatar Florian
Browse files

package updates and bug fixes for presentation

parent ea1039cd
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 199 additions and 25 deletions
MobileComputing/Screens/Home.js
+ 8
− 8
View file @ 58982185
......@@ -130,7 +130,7 @@ const styles = StyleSheet.create({
height:80,
marginLeft:10,
marginRight:10,
marginTop:10,
marginTop:50,
},
input:{
height:48,
......
MobileComputing/package-lock.json
+ 57
− 9
View file @ 58982185
......@@ -14,9 +14,10 @@
"expo": "~48.0.10",
"expo-status-bar": "~1.4.4",
"firebase": "^9.19.1",
"metro-core": "^0.76.4",
"react": "18.2.0",
"react-dom": "^18.2.0",
"react-native": "0.71.6",
"react-native": "0.71.8",
"react-native-gesture-handler": "~2.9.0",
"react-native-safe-area-context": "4.5.0",
"react-native-screens": "~3.20.0",
......@@ -5049,6 +5050,15 @@
"node": ">=8"
}
},
"node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-core": {
"version": "0.73.9",
"resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.73.9.tgz",
"integrity": "sha512-1NTs0IErlKcFTfYyRT3ljdgrISWpl1nys+gaHkXapzTSpvtX9F1NQNn5cgAuE+XIuTJhbsCdfIJiM2JXbrJQaQ==",
"dependencies": {
"lodash.throttle": "^4.1.1",
"metro-resolver": "0.73.9"
}
},
"node_modules/@react-native-community/cli-plugin-metro/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
......@@ -10180,6 +10190,15 @@
"resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.73.9.tgz",
"integrity": "sha512-uJg+6Al7UoGIuGfoxqPBy6y1Ewq7Y8/YapGYIDh6sohInwt/kYKnPZgLDYHIPvY2deORnQ/2CYo4tOeBTnhCXQ=="
},
"node_modules/metro-cache/node_modules/metro-core": {
"version": "0.73.9",
"resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.73.9.tgz",
"integrity": "sha512-1NTs0IErlKcFTfYyRT3ljdgrISWpl1nys+gaHkXapzTSpvtX9F1NQNn5cgAuE+XIuTJhbsCdfIJiM2JXbrJQaQ==",
"dependencies": {
"lodash.throttle": "^4.1.1",
"metro-resolver": "0.73.9"
}
},
"node_modules/metro-cache/node_modules/rimraf": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
......@@ -10207,7 +10226,7 @@
"metro-runtime": "0.73.9"
}
},
"node_modules/metro-core": {
"node_modules/metro-config/node_modules/metro-core": {
"version": "0.73.9",
"resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.73.9.tgz",
"integrity": "sha512-1NTs0IErlKcFTfYyRT3ljdgrISWpl1nys+gaHkXapzTSpvtX9F1NQNn5cgAuE+XIuTJhbsCdfIJiM2JXbrJQaQ==",
......@@ -10216,6 +10235,26 @@
"metro-resolver": "0.73.9"
}
},
"node_modules/metro-core": {
"version": "0.76.4",
"resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.76.4.tgz",
"integrity": "sha512-zrWl2MLvW8Nxa4sX5wnPm1cPvAu5J3DmnUMHK5PHELgJGtb5XNV7UibxmI/6zM423OQH1KPY7Hh5l3qkn4cDRQ==",
"dependencies": {
"lodash.throttle": "^4.1.1",
"metro-resolver": "0.76.4"
},
"engines": {
"node": ">=16"
}
},
"node_modules/metro-core/node_modules/metro-resolver": {
"version": "0.76.4",
"resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.76.4.tgz",
"integrity": "sha512-SXVNS+j055FLiAWx5Lems4Yw/dMxm6uo8j2ew76C+Vib++aSA/hcEoYHy1GB63jG6FmymPH3yrnyX0F6mcRnsQ==",
"engines": {
"node": ">=16"
}
},
"node_modules/metro-file-map": {
"version": "0.73.9",
"resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.73.9.tgz",
......@@ -10723,6 +10762,15 @@
"node": ">=8"
}
},
"node_modules/metro/node_modules/metro-core": {
"version": "0.73.9",
"resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.73.9.tgz",
"integrity": "sha512-1NTs0IErlKcFTfYyRT3ljdgrISWpl1nys+gaHkXapzTSpvtX9F1NQNn5cgAuE+XIuTJhbsCdfIJiM2JXbrJQaQ==",
"dependencies": {
"lodash.throttle": "^4.1.1",
"metro-resolver": "0.73.9"
}
},
"node_modules/metro/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
......@@ -12099,9 +12147,9 @@
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
},
"node_modules/react-native": {
"version": "0.71.6",
"resolved": "https://registry.npmjs.org/react-native/-/react-native-0.71.6.tgz",
"integrity": "sha512-gHrDj7qaAaiE41JwaFCh3AtvOqOLuRgZtHKzNiwxakG/wvPAYmG73ECfWHGxjxIx/QT17Hp37Da3ipCei/CayQ==",
"version": "0.71.8",
"resolved": "https://registry.npmjs.org/react-native/-/react-native-0.71.8.tgz",
"integrity": "sha512-ftMAuhpgTkbHU9brrqsEyxcNrpYvXKeATY+if22Nfhhg1zW+6wn95w9otwTnA3xHkljPCbng8mUhmmERjGEl7g==",
"dependencies": {
"@jest/create-cache-key-function": "^29.2.1",
"@react-native-community/cli": "10.2.2",
......@@ -12128,7 +12176,7 @@
"promise": "^8.3.0",
"react-devtools-core": "^4.26.1",
"react-native-codegen": "^0.71.5",
"react-native-gradle-plugin": "^0.71.17",
"react-native-gradle-plugin": "^0.71.18",
"react-refresh": "^0.4.0",
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
......@@ -12176,9 +12224,9 @@
}
},
"node_modules/react-native-gradle-plugin": {
"version": "0.71.17",
"resolved": "https://registry.npmjs.org/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.17.tgz",
"integrity": "sha512-OXXYgpISEqERwjSlaCiaQY6cTY5CH6j73gdkWpK0hedxtiWMWgH+i5TOi4hIGYitm9kQBeyDu+wim9fA8ROFJA=="
"version": "0.71.18",
"resolved": "https://registry.npmjs.org/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.18.tgz",
"integrity": "sha512-7F6bD7B8Xsn3JllxcwHhFcsl9aHIig47+3eN4IHFNqfLhZr++3ElDrcqfMzugM+niWbaMi7bJ0kAkAL8eCpdWg=="
},
"node_modules/react-native-safe-area-context": {
"version": "4.5.0",
......
MobileComputing/package.json
+ 2
− 1
View file @ 58982185
......@@ -15,9 +15,10 @@
"expo": "~48.0.10",
"expo-status-bar": "~1.4.4",
"firebase": "^9.19.1",
"metro-core": "^0.76.4",
"react": "18.2.0",
"react-dom": "^18.2.0",
"react-native": "0.71.6",
"react-native": "0.71.8",
"react-native-gesture-handler": "~2.9.0",
"react-native-safe-area-context": "4.5.0",
"react-native-screens": "~3.20.0",
......
Submission Exercise 02 (Android)/.idea/codeStyles/Project.xml 0 → 100644
+ 123
− 0
View file @ 58982185
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme>
</component>
\ No newline at end of file
Submission Exercise 02 (Android)/.idea/codeStyles/codeStyleConfig.xml 0 → 100644
+ 5
− 0
View file @ 58982185
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>
\ No newline at end of file
Submission Exercise 02 (Android)/app/src/main/java/com/example/diceroller/MainActivity.kt
+ 2
− 5
View file @ 58982185
......@@ -20,7 +20,6 @@ import com.example.diceroller.ui.theme.DiceRollerTheme
import androidx.compose.runtime.getValue
import androidx.compose.runtime.setValue
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
......@@ -38,7 +37,6 @@ fun DiceRollerApp(){
DiceWithButtonAndImage()
}
@Composable
fun DiceWithButtonAndImage(modifier: Modifier = Modifier
.fillMaxSize()
......@@ -65,5 +63,4 @@ fun DiceWithButtonAndImage(modifier: Modifier = Modifier
Text(stringResource(R.string.roll))
}
}
}
Submission Exercise 02 (Android)/build.gradle
+ 2
− 2
View file @ 58982185
......@@ -4,7 +4,7 @@ buildscript {
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
id 'com.android.application' version '7.3.1' apply false
id 'com.android.library' version '7.2.1' apply false
id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment