Skip to content

Commit e9d3121

Browse files
tscandalittatscandalitta
committed
no message
1 parent 1baa822 commit e9d3121

File tree

4 files changed

+69
-14
lines changed

4 files changed

+69
-14
lines changed

‎app/app.iml

+20-7
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7171
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7972
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
8073
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8578
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
@@ -97,25 +97,38 @@
9797
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
9898
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
9999
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
100104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
101105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
102106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
103107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
104108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
105109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/linked_res_for_bundle" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
106114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
107115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
108116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
109117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
110118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
119+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/module_bundle" />
111120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
112121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
113122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
114123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
124+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
125+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
115126
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
127+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
116128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
117129
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
118130
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
131+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
119132
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
120133
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
121134
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

‎app/src/main/res/drawable/uns.png

111 KB
Loading

‎app/src/main/res/layout/fragment_inicio.xml

+42-4
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,61 @@
66
android:layout_height="match_parent"
77
tools:context=".Main.INICIOFragment">
88

9+
<ScrollView
10+
android:layout_width="match_parent"
11+
android:layout_height="match_parent">
12+
13+
<LinearLayout
14+
android:layout_width="match_parent"
15+
android:layout_height="wrap_content"
16+
android:orientation="vertical" />
17+
</ScrollView>
18+
919
<android.support.constraint.ConstraintLayout
1020
android:layout_width="match_parent"
1121
android:layout_height="match_parent">
1222

1323
<TextView
14-
android:id="@+id/txtInicio"
24+
android:id="@+id/textView2"
1525
android:layout_width="0dp"
1626
android:layout_height="wrap_content"
17-
android:layout_marginStart="16dp"
27+
28+
android:layout_marginStart="8dp"
1829
android:layout_marginTop="16dp"
19-
android:layout_marginEnd="16dp"
30+
android:layout_marginEnd="8dp"
31+
style="@style/Titulos"
2032
android:text="@string/informacion_inicio"
2133
android:textSize="18sp"
2234
app:layout_constraintEnd_toEndOf="parent"
23-
app:layout_constraintHorizontal_bias="0.0"
35+
app:layout_constraintHorizontal_bias="0.5"
2436
app:layout_constraintStart_toStartOf="parent"
2537
app:layout_constraintTop_toTopOf="parent" />
38+
39+
<TextView
40+
android:id="@+id/textView3"
41+
android:layout_width="0dp"
42+
android:layout_height="wrap_content"
43+
android:layout_marginStart="8dp"
44+
android:layout_marginTop="16dp"
45+
android:layout_marginEnd="8dp"
46+
android:text="@string/contacto"
47+
style="@style/Titulos"
48+
49+
app:layout_constraintEnd_toEndOf="parent"
50+
app:layout_constraintHorizontal_bias="0.5"
51+
app:layout_constraintStart_toStartOf="parent"
52+
app:layout_constraintTop_toBottomOf="@+id/textView2" />
53+
54+
<ImageView
55+
android:id="@+id/imageView"
56+
android:layout_width="135dp"
57+
android:layout_height="129dp"
58+
android:layout_marginTop="16dp"
59+
android:src="@drawable/uns"
60+
app:layout_constraintEnd_toEndOf="parent"
61+
app:layout_constraintHorizontal_bias="0.5"
62+
app:layout_constraintStart_toStartOf="parent"
63+
app:layout_constraintTop_toBottomOf="@+id/textView3" />
2664
</android.support.constraint.ConstraintLayout>
2765

2866
</RelativeLayout>

‎app/src/main/res/values/strings.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,13 @@
7878

7979

8080
<string name="informacion_inicio">Esta aplicación fue diseñada como parte del final de TDP -
81-
2018\n\n\nAutores:
82-
\nTomas Scandalitta 111028\nMaximiliano Montenegro 118190\nHorus Moro 117724
83-
\n\n\nContacto:\[email protected]</string>
81+
2018\n\nAutores:
82+
\nTomas Scandalitta 111028\nMaximiliano Montenegro 118190\nHorus Moro 117724</string>
83+
84+
<string name="contacto">
85+
Cualquier mejora, sugerencia o fallo encontrado puede contactarse a
86+
través del correo [email protected]
87+
</string>
8488
<string name="par">Par</string>
8589
<string name="impar">Impar</string>
8690
<string name="calcular">calcular</string>

0 commit comments

Comments
 (0)