Skip to content

Commit 61b1c08

Browse files
efraespadaefraespada
committed
layout update
1 parent 464d25e commit 61b1c08

File tree

4 files changed

+74
-8
lines changed

4 files changed

+74
-8
lines changed

‎app/src/main/java/com/stringcare/sample/MainActivity.kt

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package com.stringcare.sample
22

33
import android.support.v7.app.AppCompatActivity
44
import android.os.Bundle
5-
import com.stringcare.library.SC
6-
import com.stringcare.library.reveal
5+
import com.stringcare.library.*
76
import kotlinx.android.synthetic.main.activity_main.*
87

98
class MainActivity : AppCompatActivity() {
@@ -16,5 +15,12 @@ class MainActivity : AppCompatActivity() {
1615
kenobi.text = R.string.kenobi.reveal()
1716
r2d2.text = R.string.r2d2.reveal()
1817
c3po.text = R.string.c3po.reveal(false)
18+
19+
"test.json".asyncJson { json ->
20+
tv_json.text = json.toString()
21+
}
22+
"test.json".asyncBytes({ false }) { bytes ->
23+
tv_json_original.text = String(bytes)
24+
}
1925
}
2026
}

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

+61-2
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,32 @@
1919
<com.stringcare.library.SCTextView
2020
android:id="@+id/kenobi"
2121
style="@style/TextAppearance.AppCompat.Body1"
22+
android:paddingTop="25dp"
23+
android:paddingStart="25dp"
24+
android:paddingEnd="25dp"
25+
android:paddingBottom="8dp"
2226
android:layout_width="wrap_content"
2327
android:layout_height="wrap_content"
2428
tools:text="@string/kenobi"/>
2529

2630
<TextView
2731
style="@style/TextAppearance.AppCompat.Body1"
2832
android:textSize="11sp"
33+
android:paddingTop="8dp"
34+
android:paddingStart="25dp"
35+
android:paddingEnd="25dp"
36+
android:paddingBottom="10dp"
2937
android:layout_width="wrap_content"
3038
android:layout_height="wrap_content"
39+
android:textColor="@android:color/darker_gray"
3140
android:text="@string/kenobi"/>
3241

3342
<com.stringcare.library.SCTextView
3443
style="@style/TextAppearance.AppCompat.Body1"
44+
android:paddingTop="10dp"
45+
android:paddingStart="25dp"
46+
android:paddingEnd="25dp"
47+
android:paddingBottom="8dp"
3548
android:layout_width="wrap_content"
3649
android:layout_height="wrap_content"
3750
android:layout_marginTop="15dp"
@@ -40,13 +53,22 @@
4053
<TextView
4154
style="@style/TextAppearance.AppCompat.Body1"
4255
android:textSize="11sp"
56+
android:paddingTop="8dp"
57+
android:paddingStart="25dp"
58+
android:paddingEnd="25dp"
59+
android:paddingBottom="10dp"
60+
android:textColor="@android:color/darker_gray"
4361
android:layout_width="wrap_content"
4462
android:layout_height="wrap_content"
4563
android:text="@string/grievous"/>
4664

4765
<com.stringcare.library.SCTextView
4866
android:id="@+id/r2d2"
4967
style="@style/TextAppearance.AppCompat.Body1"
68+
android:paddingTop="10dp"
69+
android:paddingStart="25dp"
70+
android:paddingEnd="25dp"
71+
android:paddingBottom="8dp"
5072
android:layout_width="wrap_content"
5173
android:layout_height="wrap_content"
5274
android:layout_marginTop="15dp"
@@ -55,25 +77,62 @@
5577
<TextView
5678
style="@style/TextAppearance.AppCompat.Body1"
5779
android:textSize="11sp"
80+
android:paddingTop="8dp"
81+
android:paddingStart="25dp"
82+
android:paddingEnd="25dp"
83+
android:paddingBottom="10dp"
84+
android:textColor="@android:color/darker_gray"
5885
android:layout_width="wrap_content"
5986
android:layout_height="wrap_content"
6087
android:text="@string/r2d2"/>
6188

6289
<com.stringcare.library.SCTextView
6390
android:id="@+id/c3po"
6491
style="@style/TextAppearance.AppCompat.Body1"
92+
android:paddingTop="10dp"
93+
android:paddingStart="25dp"
94+
android:paddingEnd="25dp"
95+
android:paddingBottom="8dp"
6596
android:layout_width="wrap_content"
6697
android:layout_height="wrap_content"
67-
android:layout_marginTop="15dp"
68-
android:text="@string/r2d2"/>
98+
android:layout_marginTop="15dp"/>
6999

70100
<TextView
71101
style="@style/TextAppearance.AppCompat.Body1"
72102
android:textSize="11sp"
103+
android:paddingTop="8dp"
104+
android:paddingStart="25dp"
105+
android:paddingEnd="25dp"
106+
android:paddingBottom="10dp"
73107
android:layout_width="wrap_content"
74108
android:layout_height="wrap_content"
109+
android:textColor="@android:color/darker_gray"
75110
android:text="@string/c3po"/>
76111

112+
<TextView
113+
style="@style/TextAppearance.AppCompat.Body1"
114+
android:textSize="14sp"
115+
android:paddingTop="10dp"
116+
android:paddingStart="25dp"
117+
android:paddingEnd="25dp"
118+
android:paddingBottom="8dp"
119+
android:id="@+id/tv_json"
120+
android:layout_marginTop="15dp"
121+
android:layout_width="wrap_content"
122+
android:layout_height="wrap_content"/>
123+
124+
<TextView
125+
style="@style/TextAppearance.AppCompat.Body1"
126+
android:textSize="11sp"
127+
android:paddingTop="8dp"
128+
android:paddingStart="25dp"
129+
android:paddingEnd="25dp"
130+
android:paddingBottom="25dp"
131+
android:id="@+id/tv_json_original"
132+
android:textColor="@android:color/darker_gray"
133+
android:layout_width="wrap_content"
134+
android:layout_height="wrap_content"/>
135+
77136
</LinearLayout>
78137

79138
</ScrollView>

‎build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
buildscript {
44
ext.kotlin_version = '1.3.41'
5-
ext.stringcare_version = '3.3'
5+
ext.stringcare_version = '3.4'
66

77
repositories {
88
google()
99
jcenter()
1010

1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.4.2'
13+
classpath 'com.android.tools.build:gradle:3.6.0-alpha06'
1414
classpath "com.stringcare:plugin:$stringcare_version"
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
// NOTE: Do not place your application dependencies here; they belong
@@ -36,6 +36,7 @@ stringcare {
3636
main_module "app"
3737
modules {
3838
app {
39+
assetsFiles = ["*.json"]
3940
stringFiles = ['strings.xml', "strings_extra.xml"]
4041
srcFolders = ['src/main', "src/other_source"]
4142
}

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon May 27 12:18:46 CEST 2019
1+
#Sat Aug 17 21:52:33 CEST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip

0 commit comments

Comments
 (0)