Skip to content

Commit 6fa4753

Browse files
c99koderc99koder
committed
make ash screenshots monospace
1 parent 8834dc8 commit 6fa4753

File tree

6 files changed

+78
-67
lines changed

6 files changed

+78
-67
lines changed

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ android {
6868
testBuildType "mockdata"
6969

7070
defaultConfig {
71-
versionCode 224
71+
versionCode 225
7272
versionName "4.16"
73-
minSdkVersion 18
73+
minSdkVersion 17
7474
targetSdkVersion 28
7575
multiDexEnabled true
7676
applicationId "com.irccloud.android"

‎fastlane/Fastfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ platform :android do
8282
tests_package_name: "com.irccloud.android.test",
8383
test_instrumentation_runner: "androidx.test.runner.AndroidJUnitRunner",
8484
use_tests_in_classes: ["com.irccloud.android.test.Screenshots"],
85-
launch_arguments: ["theme midnight"],
85+
launch_arguments: ["theme ash"],
8686
device_type: "phone",
8787
specific_device: "emulator-5580"
8888
)
@@ -122,7 +122,7 @@ platform :android do
122122
tests_package_name: "com.irccloud.android.test",
123123
test_instrumentation_runner: "androidx.test.runner.AndroidJUnitRunner",
124124
use_tests_in_classes: ["com.irccloud.android.test.Screenshots"],
125-
launch_arguments: ["theme midnight"],
125+
launch_arguments: ["theme ash"],
126126
device_type: "sevenInch",
127127
specific_device: "emulator-5580"
128128
)
@@ -161,7 +161,7 @@ platform :android do
161161
tests_package_name: "com.irccloud.android.test",
162162
test_instrumentation_runner: "androidx.test.runner.AndroidJUnitRunner",
163163
use_tests_in_classes: ["com.irccloud.android.test.Screenshots"],
164-
launch_arguments: ["theme midnight"],
164+
launch_arguments: ["theme ash"],
165165
device_type: "tenInch",
166166
specific_device: "emulator-5580"
167167
)

‎irccloud-android.iml

+44-37
Original file line numberDiff line numberDiff line change
@@ -8,52 +8,58 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
11+
<option name="SELECTED_BUILD_VARIANT" value="mockdata" />
12+
<option name="ASSEMBLE_TASK_NAME" value="assembleMockdata" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileMockdataSources" />
1414
<afterSyncTasks>
15-
<task>generateDebugSources</task>
15+
<task>generateMockdataSources</task>
1616
</afterSyncTasks>
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
18-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res;file://$MODULE_DIR$/themes;file://$MODULE_DIR$/build/generated/fabric/res/debug;file://$MODULE_DIR$/build/generated/res/rs/debug" />
18+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res;file://$MODULE_DIR$/themes;file://$MODULE_DIR$/build/generated/fabric/res/mockdata;file://$MODULE_DIR$/build/generated/res/rs/mockdata;file://$MODULE_DIR$/build/generated/res/resValues/mockdata" />
1919
</configuration>
2020
</facet>
2121
</component>
2222
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
23-
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
24-
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
23+
<output url="file://$MODULE_DIR$/build/intermediates/javac/mockdata/compileMockdataJavaWithJavac/classes" />
24+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/mockdataUnitTest/compileMockdataUnitTestJavaWithJavac/classes" />
2525
<exclude-output />
2626
<content url="file://$MODULE_DIR$">
27-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
28-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
29-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
30-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/data_binding_base_class_source_out/debug/dataBindingGenBaseClassesDebug/out" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
40-
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
46-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
47-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
27+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/mockdata" isTestSource="false" generated="true" />
28+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/mockdata/compileMockdataAidl/out" isTestSource="false" generated="true" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/mockdata" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/mockdata/compileMockdataRenderscript/out" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/data_binding_base_class_source_out/mockdata/dataBindingGenBaseClassesMockdata/out" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/mockdata" type="java-resource" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/mockdata" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/mockdata" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/mockdata" isTestSource="true" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/mockdataAndroidTest/compileMockdataAndroidTestAidl/out" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/mockdata" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/mockdataAndroidTest/compileMockdataAndroidTestRenderscript/out" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/mockdata" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/mockdata" type="java-test-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/mockdata" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/res" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/resources" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/assets" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/aidl" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/java" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/rs" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/shaders" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/res" type="java-test-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/resources" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/assets" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/aidl" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/java" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/rs" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/shaders" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/res" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/resources" type="java-test-resource" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/assets" type="java-test-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/aidl" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/java" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/rs" isTestSource="true" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/shaders" isTestSource="true" />
5763
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
5864
<sourceFolder url="file://$MODULE_DIR$/themes" type="java-resource" />
5965
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
@@ -228,5 +234,6 @@
228234
<orderEntry type="library" scope="TEST" name="Gradle: androidx.multidex:multidex-instrumentation:2.0.0@aar" level="project" />
229235
<orderEntry type="module" module-name="android-websockets" />
230236
<orderEntry type="module" module-name="android-websockets" />
237+
<orderEntry type="module" module-name="android-websockets" />
231238
</component>
232239
</module>

‎src/com/irccloud/android/activity/MainActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2037,7 +2037,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
20372037
if(fileUploadTask.metadataDialog == null && !fileUploadTask.filenameSet && ActivityCompat.checkSelfPermission(MainActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)
20382038
fileUploadTask.show_dialog();
20392039
}
2040-
messageTxt.setEnabled(buffer != null);
2040+
messageTxt.setEnabled(buffer != null && !BuildConfig.MOCK_DATA);
20412041

20422042
if(pastebinResult != null) {
20432043
String text = "";
@@ -5749,7 +5749,7 @@ public void run() {
57495749
}
57505750
}
57515751
update_suggestions(false);
5752-
messageTxt.setEnabled(buffer != null);
5752+
messageTxt.setEnabled(buffer != null && !BuildConfig.MOCK_DATA);
57535753
if(server != null && server.isSlack()) {
57545754
messageTxt.setCustomSelectionActionModeCallback(null);
57555755
findViewById(R.id.formatBtn).setVisibility(View.GONE);

‎src/com/irccloud/android/activity/PreferencesActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public void onResume() {
411411
IRCCloudApplication.getInstance().onResume(this);
412412

413413
String session = getSharedPreferences("prefs", 0).getString("session_key", "");
414-
if (session != null && session.length() > 0) {
414+
if ((session != null && session.length() > 0) || BuildConfig.MOCK_DATA) {
415415
if (conn.getUserInfo() != null)
416416
findPreference("name").setSummary(conn.getUserInfo().name);
417417
else

‎tests/src/com/irccloud/android/test/Screenshots.java

+26-22
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.preference.PreferenceManager;
88

99
import com.irccloud.android.activity.MainActivity;
10+
import com.irccloud.android.data.collection.ImageList;
1011

1112
import org.junit.Before;
1213
import org.junit.Rule;
@@ -44,16 +45,23 @@ public void setup() {
4445
Context context = getInstrumentation().getTargetContext();
4546
SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
4647
editor.putString("theme", theme);
48+
editor.putBoolean("monospace", theme.equals("ash"));
4749
editor.commit();
4850

4951
Screengrab.setDefaultScreenshotStrategy(new UiAutomatorScreenshotStrategy());
5052

53+
SystemClock.sleep(5000);
54+
55+
ImageList.getInstance().purge();
56+
ImageList.getInstance().clearFailures();
57+
5158
activityRule.getActivity().runOnUiThread(new Runnable() {
5259
@Override
5360
public void run() {
5461
activityRule.getActivity().recreate();
5562
}
5663
});
64+
SystemClock.sleep(5000);
5765
}
5866

5967
@Test
@@ -65,36 +73,32 @@ public void testTakeScreenshotsPortrait() {
6573

6674
}
6775
SystemClock.sleep(5000);
68-
device.findObject(new UiSelector().className("com.irccloud.android.IRCEditText").enabled(false));
76+
device.findObject(new UiSelector().className("com.irccloud.android.IRCEditText").focused(false));
6977
Screengrab.screenshot("messages-portrait-" + theme);
70-
try {
71-
device.findObject(new UiSelector().description("Channel list")).click();
72-
SystemClock.sleep(5000);
73-
Screengrab.screenshot("menu-portrait-" + theme);
74-
device.pressBack();
75-
} catch (Exception e) {
76-
77-
}
78-
try {
79-
device.findObject(new UiSelector().description("Channel members list")).click();
80-
SystemClock.sleep(5000);
81-
Screengrab.screenshot("members-portrait-" + theme);
82-
device.pressBack();
83-
} catch (Exception e) {
78+
if(theme.equals("dawn")) {
79+
try {
80+
device.findObject(new UiSelector().description("Channel members list")).click();
81+
SystemClock.sleep(5000);
82+
Screengrab.screenshot("members-portrait-" + theme);
83+
device.pressBack();
84+
} catch (Exception e) {
8485

86+
}
8587
}
8688
}
8789

8890
@Test
8991
public void testTakeScreenshotsLandscape() {
90-
UiDevice device = UiDevice.getInstance(getInstrumentation());
91-
try {
92-
device.setOrientationLeft();
93-
} catch (Exception e) {
92+
if(theme.equals("dawn")) {
93+
UiDevice device = UiDevice.getInstance(getInstrumentation());
94+
try {
95+
device.setOrientationLeft();
96+
} catch (Exception e) {
9497

98+
}
99+
SystemClock.sleep(5000);
100+
device.findObject(new UiSelector().className("com.irccloud.android.IRCEditText").enabled(false));
101+
Screengrab.screenshot("messages-landscape-" + theme);
95102
}
96-
SystemClock.sleep(5000);
97-
device.findObject(new UiSelector().className("com.irccloud.android.IRCEditText").enabled(false));
98-
Screengrab.screenshot("messages-landscape-" + theme);
99103
}
100104
}

0 commit comments

Comments
 (0)