Skip to content

Commit 96623bb

Browse files
eoin-creoin-cr
committed
Button now creates toast, changed name
1 parent 5ae4b9a commit 96623bb

38 files changed

+895
-4
lines changed

‎app/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎app/build.gradle.kts

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
plugins {
2+
id("com.android.application")
3+
id("org.jetbrains.kotlin.android")
4+
}
5+
6+
android {
7+
namespace = "com.example.accelerometerstorer"
8+
compileSdk = 33
9+
10+
defaultConfig {
11+
applicationId = "com.example.accelerometerstorer"
12+
minSdk = 24
13+
targetSdk = 33
14+
versionCode = 1
15+
versionName = "1.0"
16+
17+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
18+
vectorDrawables {
19+
useSupportLibrary = true
20+
}
21+
}
22+
23+
buildTypes {
24+
release {
25+
isMinifyEnabled = false
26+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
27+
}
28+
}
29+
compileOptions {
30+
sourceCompatibility = JavaVersion.VERSION_1_8
31+
targetCompatibility = JavaVersion.VERSION_1_8
32+
}
33+
kotlinOptions {
34+
jvmTarget = "1.8"
35+
}
36+
buildFeatures {
37+
compose = true
38+
}
39+
composeOptions {
40+
kotlinCompilerExtensionVersion = "1.4.3"
41+
}
42+
packaging {
43+
resources {
44+
excludes += "/META-INF/{AL2.0,LGPL2.1}"
45+
}
46+
}
47+
}
48+
49+
dependencies {
50+
51+
implementation("androidx.core:core-ktx:1.9.0")
52+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
53+
implementation("androidx.activity:activity-compose:1.7.0")
54+
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
55+
implementation("androidx.compose.ui:ui")
56+
implementation("androidx.compose.ui:ui-graphics")
57+
implementation("androidx.compose.ui:ui-tooling-preview")
58+
implementation("androidx.compose.material3:material3")
59+
testImplementation("junit:junit:4.13.2")
60+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
61+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
62+
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
63+
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
64+
debugImplementation("androidx.compose.ui:ui-tooling")
65+
debugImplementation("androidx.compose.ui:ui-test-manifest")
66+
}

‎app/proguard-rules.pro

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

‎app/src/androidTest/java/com/example/pedaltothemetal/ExampleInstrumentedTest.kt

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.example.pedaltothemetal
2+
3+
import androidx.test.platform.app.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
6+
import org.junit.Test
7+
import org.junit.runner.RunWith
8+
9+
import org.junit.Assert.*
10+
11+
/**
12+
* Instrumented test, which will execute on an Android device.
13+
*
14+
* See [testing documentation](http://d.android.com/tools/testing).
15+
*/
16+
@RunWith(AndroidJUnit4::class)
17+
class ExampleInstrumentedTest {
18+
@Test
19+
fun useAppContext() {
20+
// Context of the app under test.
21+
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22+
assertEquals("com.example.accelerometerstorer", appContext.packageName)
23+
}
24+
}

‎app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">-->
88
<application android:label="@string/app_name">
99

10-
<activity android:name=".AccelerometerActivity"
10+
<activity android:name="com.example.pedaltothemetal.AccelerometerActivity"
1111
android:label="@string/app_name"
1212
android:exported="true">
1313
<intent-filter>

‎app/src/main/java/com/example/accelerometerstorer/AccelerometerActivity.java ‎app/src/main/java/com/example/pedaltothemetal/AccelerometerActivity.java

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.accelerometerstorer;
1+
package com.example.pedaltothemetal;
22

33
import android.app.Activity;
44
import android.content.Context;
@@ -8,7 +8,14 @@
88
import android.hardware.SensorManager;
99
import android.os.Bundle;
1010
import android.util.Log;
11+
import android.view.View;
1112
import android.widget.TextView;
13+
import android.widget.Button;
14+
import android.widget.Toast;
15+
16+
//import androidx.compose.material3.Button;
17+
18+
import com.example.accelerometerstorer.R;
1219

1320
import java.io.IOException;
1421
import java.io.OutputStreamWriter;
@@ -42,6 +49,15 @@ public void onCreate(Bundle savedInstanceState){
4249
SensorManager.SENSOR_DELAY_NORMAL);
4350

4451

52+
Button button = (Button)findViewById(R.id.fileButton);
53+
button.setOnClickListener(new View.OnClickListener(){
54+
@Override
55+
public void onClick(View view) {
56+
// click handling code
57+
Toast.makeText(getApplicationContext(), "File button has been clicked!", Toast.LENGTH_LONG).show();
58+
}
59+
});
60+
4561
}
4662

4763
public void onAccuracyChanged(Sensor sensor,int accuracy){
@@ -78,4 +94,5 @@ private void writeToFile(String data, Context context) {
7894
Log.e("Exception", "File write failed: " + e.toString());
7995
}
8096
}
97+
8198
}

‎app/src/main/java/com/example/pedaltothemetal/MainActivity.kt

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
//package com.example.accelerometerstorer
2+
//
3+
//import android.os.Bundle
4+
//import androidx.activity.ComponentActivity
5+
//import androidx.activity.compose.setContent
6+
//import androidx.compose.foundation.layout.fillMaxSize
7+
//import androidx.compose.material3.MaterialTheme
8+
//import androidx.compose.material3.Surface
9+
//import androidx.compose.material3.Text
10+
//import androidx.compose.runtime.Composable
11+
//import androidx.compose.ui.Modifier
12+
//import androidx.compose.ui.tooling.preview.Preview
13+
//import com.example.accelerometerstorer.ui.theme.AccelerometerStorerTheme
14+
//
15+
//class MainActivity : ComponentActivity() {
16+
// override fun onCreate(savedInstanceState: Bundle?) {
17+
// super.onCreate(savedInstanceState)
18+
// setContent {
19+
// AccelerometerStorerTheme {
20+
// // A surface container using the 'background' color from the theme
21+
// Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
22+
// Greeting("Android")
23+
// }
24+
// }
25+
// }
26+
// }
27+
//}
28+
//
29+
//@Composable
30+
//fun Greeting(name: String, modifier: Modifier = Modifier) {
31+
// Text(
32+
// text = "Hello $name!",
33+
// modifier = modifier
34+
// )
35+
//}
36+
//
37+
//@Preview(showBackground = true)
38+
//@Composable
39+
//fun GreetingPreview() {
40+
// AccelerometerStorerTheme {
41+
// Greeting("Android")
42+
// }
43+
//}

‎app/src/main/java/com/example/pedaltothemetal/ui/theme/Color.kt

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.example.pedaltothemetal.ui.theme
2+
3+
import androidx.compose.ui.graphics.Color
4+
5+
val Purple80 = Color(0xFFD0BCFF)
6+
val PurpleGrey80 = Color(0xFFCCC2DC)
7+
val Pink80 = Color(0xFFEFB8C8)
8+
9+
val Purple40 = Color(0xFF6650a4)
10+
val PurpleGrey40 = Color(0xFF625b71)
11+
val Pink40 = Color(0xFF7D5260)

‎app/src/main/java/com/example/pedaltothemetal/ui/theme/Theme.kt

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
package com.example.pedaltothemetal.ui.theme
2+
3+
import android.app.Activity
4+
import android.os.Build
5+
import androidx.compose.foundation.isSystemInDarkTheme
6+
import androidx.compose.material3.MaterialTheme
7+
import androidx.compose.material3.darkColorScheme
8+
import androidx.compose.material3.dynamicDarkColorScheme
9+
import androidx.compose.material3.dynamicLightColorScheme
10+
import androidx.compose.material3.lightColorScheme
11+
import androidx.compose.runtime.Composable
12+
import androidx.compose.runtime.SideEffect
13+
import androidx.compose.ui.graphics.toArgb
14+
import androidx.compose.ui.platform.LocalContext
15+
import androidx.compose.ui.platform.LocalView
16+
import androidx.core.view.WindowCompat
17+
18+
private val DarkColorScheme = darkColorScheme(
19+
primary = Purple80,
20+
secondary = PurpleGrey80,
21+
tertiary = Pink80
22+
)
23+
24+
private val LightColorScheme = lightColorScheme(
25+
primary = Purple40,
26+
secondary = PurpleGrey40,
27+
tertiary = Pink40
28+
29+
/* Other default colors to override
30+
background = Color(0xFFFFFBFE),
31+
surface = Color(0xFFFFFBFE),
32+
onPrimary = Color.White,
33+
onSecondary = Color.White,
34+
onTertiary = Color.White,
35+
onBackground = Color(0xFF1C1B1F),
36+
onSurface = Color(0xFF1C1B1F),
37+
*/
38+
)
39+
40+
@Composable
41+
fun AccelerometerStorerTheme(
42+
darkTheme: Boolean = isSystemInDarkTheme(),
43+
// Dynamic color is available on Android 12+
44+
dynamicColor: Boolean = true,
45+
content: @Composable () -> Unit
46+
) {
47+
val colorScheme = when {
48+
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
49+
val context = LocalContext.current
50+
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
51+
}
52+
53+
darkTheme -> DarkColorScheme
54+
else -> LightColorScheme
55+
}
56+
val view = LocalView.current
57+
if (!view.isInEditMode) {
58+
SideEffect {
59+
val window = (view.context as Activity).window
60+
window.statusBarColor = colorScheme.primary.toArgb()
61+
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
62+
}
63+
}
64+
65+
MaterialTheme(
66+
colorScheme = colorScheme,
67+
typography = Typography,
68+
content = content
69+
)
70+
}

‎app/src/main/java/com/example/pedaltothemetal/ui/theme/Type.kt

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package com.example.pedaltothemetal.ui.theme
2+
3+
import androidx.compose.material3.Typography
4+
import androidx.compose.ui.text.TextStyle
5+
import androidx.compose.ui.text.font.FontFamily
6+
import androidx.compose.ui.text.font.FontWeight
7+
import androidx.compose.ui.unit.sp
8+
9+
// Set of Material typography styles to start with
10+
val Typography = Typography(
11+
bodyLarge = TextStyle(
12+
fontFamily = FontFamily.Default,
13+
fontWeight = FontWeight.Normal,
14+
fontSize = 16.sp,
15+
lineHeight = 24.sp,
16+
letterSpacing = 0.5.sp
17+
)
18+
/* Other default text styles to override
19+
titleLarge = TextStyle(
20+
fontFamily = FontFamily.Default,
21+
fontWeight = FontWeight.Normal,
22+
fontSize = 22.sp,
23+
lineHeight = 28.sp,
24+
letterSpacing = 0.sp
25+
),
26+
labelSmall = TextStyle(
27+
fontFamily = FontFamily.Default,
28+
fontWeight = FontWeight.Medium,
29+
fontSize = 11.sp,
30+
lineHeight = 16.sp,
31+
letterSpacing = 0.5.sp
32+
)
33+
*/
34+
)

0 commit comments

Comments
 (0)