diff --git a/app/build.gradle b/app/build.gradle
index 445372a..32d1ed5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,6 +92,9 @@ dependencies {
compile libraries.supportDesign
compile libraries.supportRecyclerView
compile libraries.supportCardView
+ compile libraries.supportConstraintLayout
+
+ compile libraries.flexbox
compile libraries.butterKnife
apt libraries.butterKnifeCompiler
diff --git a/app/src/main/res/layout/constraint_layout.xml b/app/src/main/res/layout/constraint_layout.xml
new file mode 100644
index 0000000..25bb1d2
--- /dev/null
+++ b/app/src/main/res/layout/constraint_layout.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/flexbox_layout.xml b/app/src/main/res/layout/flexbox_layout.xml
new file mode 100644
index 0000000..0349211
--- /dev/null
+++ b/app/src/main/res/layout/flexbox_layout.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_content.xml b/app/src/main/res/layout/fragment_content.xml
index ff2c028..7d3f468 100644
--- a/app/src/main/res/layout/fragment_content.xml
+++ b/app/src/main/res/layout/fragment_content.xml
@@ -1,14 +1,35 @@
-
+ android:layout_height="match_parent">
-
+
-
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/relative_layout.xml b/app/src/main/res/layout/relative_layout.xml
new file mode 100644
index 0000000..765f80c
--- /dev/null
+++ b/app/src/main/res/layout/relative_layout.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/table_layout.xml b/app/src/main/res/layout/table_layout.xml
new file mode 100644
index 0000000..9900cd5
--- /dev/null
+++ b/app/src/main/res/layout/table_layout.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7474f04..f04ecce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
- Yamblz
+ ViewGroups HW
Hello
diff --git a/app/src/test/java/ru/yandex/yamblz/developer_settings/DeveloperSettingsModelImplTest.java b/app/src/test/java/ru/yandex/yamblz/developer_settings/DeveloperSettingsModelImplTest.java
index ad17f4a..e670f2c 100644
--- a/app/src/test/java/ru/yandex/yamblz/developer_settings/DeveloperSettingsModelImplTest.java
+++ b/app/src/test/java/ru/yandex/yamblz/developer_settings/DeveloperSettingsModelImplTest.java
@@ -5,80 +5,27 @@
import org.junit.Before;
import org.junit.Test;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import hu.supercluster.paperwork.Paperwork;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
public class DeveloperSettingsModelImplTest {
private DeveloperSettingsModelImpl developerSettingsModel;
private DeveloperSettings developerSettings;
- private Paperwork paperwork;
@Before
public void beforeEachTest() {
developerSettings = mock(DeveloperSettings.class);
- paperwork = mock(Paperwork.class);
developerSettingsModel = new DeveloperSettingsModelImpl(
mock(App.class),
developerSettings,
- mock(LeakCanaryProxy.class),
- paperwork
+ mock(LeakCanaryProxy.class)
);
}
- @Test
- public void testGetGitSha() {
- when(paperwork.get("gitSha")).thenReturn("abc123");
-
- assertThat(developerSettingsModel.getGitSha()).isEqualTo("abc123");
- verify(paperwork).get("gitSha");
- verifyNoMoreInteractions(paperwork);
- }
-
- @Test
- public void getGitSha_shouldReturnSameResultForSeveralCalls() {
- when(paperwork.get("gitSha")).thenReturn("abc123");
-
- String sha1 = developerSettingsModel.getGitSha();
- String sha2 = developerSettingsModel.getGitSha();
- String sha3 = developerSettingsModel.getGitSha();
-
- assertThat(sha1).isEqualTo(sha2).isEqualTo(sha3).isEqualTo("abc123");
- }
-
- @Test
- public void testGetBuildDate() {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String date = dateFormat.format(new Date());
- when(paperwork.get("buildDate")).thenReturn(date);
-
- assertThat(developerSettingsModel.getBuildDate()).isEqualTo(date);
- verify(paperwork).get("buildDate");
- verifyNoMoreInteractions(paperwork);
- }
-
- @Test
- public void getBuildDate_shouldReturnSameResultForSeveralCalls() {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String date = dateFormat.format(new Date());
- when(paperwork.get("buildDate")).thenReturn(date);
-
- String buildDate1 = developerSettingsModel.getBuildDate();
- String buildDate2 = developerSettingsModel.getBuildDate();
- String buildDate3 = developerSettingsModel.getBuildDate();
-
- assertThat(buildDate1).isEqualTo(buildDate2).isEqualTo(buildDate3).isEqualTo(date);
- }
-
@Test
public void getBuildVersionCode_shouldNotBeNull() {
assertThat(developerSettingsModel.getBuildVersionCode()).isNotNull();
diff --git a/app/src/test/java/ru/yandex/yamblz/ui/presenters/DeveloperSettingsPresenterTest.java b/app/src/test/java/ru/yandex/yamblz/ui/presenters/DeveloperSettingsPresenterTest.java
index 0622e59..299e6bf 100644
--- a/app/src/test/java/ru/yandex/yamblz/ui/presenters/DeveloperSettingsPresenterTest.java
+++ b/app/src/test/java/ru/yandex/yamblz/ui/presenters/DeveloperSettingsPresenterTest.java
@@ -26,22 +26,6 @@ public void beforeEachTest() {
developerSettingsView = mock(DeveloperSettingsView.class);
}
- @Test
- public void bindView_shouldSendGitShaToTheView() {
- when(developerSettingsModel.getGitSha()).thenReturn("test git sha");
-
- developerSettingsPresenter.bindView(developerSettingsView);
- verify(developerSettingsView).changeGitSha("test git sha");
- }
-
- @Test
- public void bindView_shouldSendBuildDateToTheView() {
- when(developerSettingsModel.getBuildDate()).thenReturn("test build date");
-
- developerSettingsPresenter.bindView(developerSettingsView);
- verify(developerSettingsView).changeBuildDate("test build date");
- }
-
@Test
public void bindView_shouldSendBuildVersionCodeToTheView() {
when(developerSettingsModel.getBuildVersionCode()).thenReturn("test build version code");
diff --git a/dependencies.gradle b/dependencies.gradle
index b3a6224..227ddea 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -7,7 +7,7 @@ ext.versions = [
compileSdk : 23,
buildTools : '23.0.3',
- androidGradlePlugin : '2.2.0-alpha4',
+ androidGradlePlugin : '2.1.2',
aptGradlePlugin : '1.8',
retrolambdaGradlePlugin : '3.2.5',
lombokGradlePlugin : '0.2.3.a2',
@@ -23,6 +23,8 @@ ext.versions = [
supportLibs : '23.4.0',
butterKnife : '8.0.1',
timber : '4.1.2',
+ supportConstraintLayout : '1.0.0-alpha1',
+ flexbox : '0.2.2',
espresso : '2.2.1',
stetho : '1.3.1',
@@ -63,6 +65,9 @@ ext.libraries = [
supportRecyclerView : "com.android.support:recyclerview-v7:$versions.supportLibs",
supportCardView : "com.android.support:cardview-v7:$versions.supportLibs",
+ supportConstraintLayout : "com.android.support.constraint:constraint-layout:$versions.supportConstraintLayout",
+ flexbox : "com.google.android:flexbox:$versions.flexbox",
+
butterKnife : "com.jakewharton:butterknife:$versions.butterKnife",
butterKnifeCompiler : "com.jakewharton:butterknife-compiler:$versions.butterKnife",
timber : "com.jakewharton.timber:timber:$versions.timber",