Skip to content

Commit 7ae14d9

Browse files
committed
Missing files and fixing a bug
1 parent 9a5bd33 commit 7ae14d9

File tree

6 files changed

+386
-212
lines changed

6 files changed

+386
-212
lines changed

.idea/workspace.xml

Lines changed: 344 additions & 178 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/genonbeta/CoolSocket/test/database/TemplateListDatabase.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ public boolean isAddable(String str)
114114
if (getShortcut(str) != null)
115115
return false;
116116
} catch (Exception e)
117-
{
118-
return false;
119-
}
117+
{}
120118
}
121119

122120
return true;

app/src/main/res/layout-large-v4/list_pair.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_height="wrap_content"
1919
android:layout_alignParentRight="true"
2020
android:ellipsize="end"
21-
android:singleLine="true"
21+
android:maxLines="1"
2222
android:textSize="15sp"
2323
android:textStyle="italic"
2424
/>
@@ -29,9 +29,8 @@
2929
android:layout_width="wrap_content"
3030
android:layout_height="wrap_content"
3131
android:layout_alignParentLeft="true"
32-
android:layout_toLeftOf="@+id/list_text2"
3332
android:ellipsize="end"
34-
android:singleLine="true"
33+
android:maxLines="1"
3534
android:textSize="16sp"
3635
android:textStyle="bold"
3736
/>
@@ -43,7 +42,7 @@
4342
style="@style/secondaryText"
4443
android:layout_width="wrap_content"
4544
android:layout_height="wrap_content"
46-
android:singleLine="true"
45+
android:maxLines="1"
4746
android:textSize="14sp"
4847
android:visibility="gone"
4948
/>

app/src/main/res/layout/list.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="@drawable/checkable_item_background" android:padding="15dp" android:layout_width="match_parent" android:layout_height="match_parent">
3-
<TextView android:textSize="16sp" android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" style="@style/primaryText" />
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:background="@drawable/checkable_item_background"
6+
android:padding="15dp">
7+
8+
<TextView
9+
android:id="@+id/text"
10+
style="@style/primaryText"
11+
android:layout_width="wrap_content"
12+
android:layout_height="wrap_content"
13+
android:layout_centerVertical="true"
14+
android:textSize="16sp"/>
415
</RelativeLayout>

app/src/main/res/layout/list_json.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
android:paddingRight="5dp"
1717
android:layout_width="wrap_content"
1818
android:layout_height="wrap_content"
19-
android:singleLine="true"
19+
android:maxLines="1"
2020
android:layout_alignParentLeft="true"
2121
android:layout_centerVertical="true"
2222
style="@style/primaryText"

build/intermediates/dex-cache/cache.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,15 @@
136136
sha1="7521486d9bfd2cd9e756e0cf75ed7d97f2ce2d3b">
137137
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/com.android.support-recyclerview-v7-24.2.1_8a6e762a97a69b91c9b9f6694e400179928bf7ff.jar" />
138138
</item>
139+
<item
140+
is-multidex="false"
141+
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars/libs/internal_impl-24.2.1.jar"
142+
jumboMode="false"
143+
optimize="true"
144+
revision="24.0.3"
145+
sha1="fbf8da429efd5ad21e02e3e5ecaa1efc4167878d">
146+
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/internal_impl-24.2.1_7a836bcce9fab5d03c4a110b1030561e6356ba57.jar" />
147+
</item>
139148
<item
140149
is-multidex="false"
141150
jar="/home/veli/CoolSocket-Client/app/build/intermediates/incremental-runtime-classes/debug/instant-run.jar"
@@ -147,21 +156,21 @@
147156
</item>
148157
<item
149158
is-multidex="false"
150-
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars/libs/internal_impl-24.2.1.jar"
159+
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars/libs/internal_impl-24.2.1.jar"
151160
jumboMode="false"
152161
optimize="true"
153162
revision="24.0.3"
154-
sha1="fbf8da429efd5ad21e02e3e5ecaa1efc4167878d">
155-
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/internal_impl-24.2.1_7a836bcce9fab5d03c4a110b1030561e6356ba57.jar" />
163+
sha1="867dad63c33388ff8c7644b236579355036d075f">
164+
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/internal_impl-24.2.1_b209e6251d8ce61643bba9476db913efabc7f443.jar" />
156165
</item>
157166
<item
158167
is-multidex="false"
159-
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars/libs/internal_impl-24.2.1.jar"
168+
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars/classes.jar"
160169
jumboMode="false"
161170
optimize="true"
162171
revision="24.0.3"
163-
sha1="867dad63c33388ff8c7644b236579355036d075f">
164-
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/internal_impl-24.2.1_b209e6251d8ce61643bba9476db913efabc7f443.jar" />
172+
sha1="9c4c3bc902450c39ed54de170db4fb12aea20a35">
173+
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/com.android.support-support-core-utils-24.2.1_b0e7653bc0a31aa71783f2601243a0b9bd300f02.jar" />
165174
</item>
166175
<item
167176
is-multidex="false"
@@ -172,15 +181,6 @@
172181
sha1="8de3aafecbdf98a61db6427f008f2d515bcd2544">
173182
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/support-annotations-24.2.1_229ea1be6c3a7eb179ae35552c26a9f94b0ee3f7.jar" />
174183
</item>
175-
<item
176-
is-multidex="false"
177-
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars/classes.jar"
178-
jumboMode="false"
179-
optimize="true"
180-
revision="24.0.3"
181-
sha1="9c4c3bc902450c39ed54de170db4fb12aea20a35">
182-
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/com.android.support-support-core-utils-24.2.1_b0e7653bc0a31aa71783f2601243a0b9bd300f02.jar" />
183-
</item>
184184
<item
185185
is-multidex="false"
186186
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/24.2.1/jars/classes.jar"
@@ -223,7 +223,7 @@
223223
jumboMode="true"
224224
optimize="true"
225225
revision="24.0.3"
226-
sha1="198cd5faa07dc9b819054ebe43dcd1eae2bda7cd">
226+
sha1="cb90243b72a0626d8f742970df86ecde37e432a6">
227227
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/instant-run-bootstrap_d106d0457e9fca6f780270ec9775499fd28cc567.jar" />
228228
</item>
229229
<item
@@ -264,21 +264,21 @@
264264
</item>
265265
<item
266266
is-multidex="false"
267-
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars/libs/internal_impl-24.2.1.jar"
268-
jumboMode="true"
267+
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars/classes.jar"
268+
jumboMode="false"
269269
optimize="true"
270270
revision="24.0.3"
271-
sha1="7e4389bd133359a2ff88623ff1e4ff93d6e6f780">
272-
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/internal_impl-24.2.1_782501acd138235724228fc4a490ff5ee5272e47.jar" />
271+
sha1="94bc1dfb84dcc8b6f6f8f7cc726d7b2dd39c1574">
272+
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/com.android.support-animated-vector-drawable-24.2.1_68898cd6a7c7820883a1af1f29a1723f55d341c7.jar" />
273273
</item>
274274
<item
275275
is-multidex="false"
276-
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars/classes.jar"
277-
jumboMode="false"
276+
jar="/home/veli/CoolSocket-Client/app/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars/libs/internal_impl-24.2.1.jar"
277+
jumboMode="true"
278278
optimize="true"
279279
revision="24.0.3"
280-
sha1="94bc1dfb84dcc8b6f6f8f7cc726d7b2dd39c1574">
281-
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/com.android.support-animated-vector-drawable-24.2.1_68898cd6a7c7820883a1af1f29a1723f55d341c7.jar" />
280+
sha1="7e4389bd133359a2ff88623ff1e4ff93d6e6f780">
281+
<dex dex="/home/veli/CoolSocket-Client/app/build/intermediates/pre-dexed/debug/internal_impl-24.2.1_782501acd138235724228fc4a490ff5ee5272e47.jar" />
282282
</item>
283283
<item
284284
is-multidex="false"

0 commit comments

Comments
 (0)