Fix merge conflict (805a1f9b) · Commits · e / os / Weather

.idea/codeStyleSettings.xml

0 → 100644

+229 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<project version="4">
		<component name="ProjectCodeStyleSettingsManager">
		<option name="PER_PROJECT_SETTINGS">
		<value>
		<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
		<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
		<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
		<value />
		</option>
		<option name="IMPORT_LAYOUT_TABLE">
		<value>
		<package name="android" withSubpackages="true" static="false" />
		<emptyLine />
		<package name="com" withSubpackages="true" static="false" />
		<emptyLine />
		<package name="junit" withSubpackages="true" static="false" />
		<emptyLine />
		<package name="net" withSubpackages="true" static="false" />
		<emptyLine />
		<package name="org" withSubpackages="true" static="false" />
		<emptyLine />
		<package name="java" withSubpackages="true" static="false" />
		<emptyLine />
		<package name="javax" withSubpackages="true" static="false" />
		<emptyLine />
		<package name="" withSubpackages="true" static="false" />
		<emptyLine />
		<package name="" withSubpackages="true" static="true" />
		<emptyLine />
		</value>
		</option>
		<option name="RIGHT_MARGIN" value="100" />
		<AndroidXmlCodeStyleSettings>
		<option name="USE_CUSTOM_SETTINGS" value="true" />
		</AndroidXmlCodeStyleSettings>
		<Objective-C-extensions>
		<option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
		<option name="RELEASE_STYLE" value="IVAR" />
		<option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
		<file>
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
		</file>
		<class>
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
		<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
		</class>
		<extensions>
		<pair source="cpp" header="h" />
		<pair source="c" header="h" />
		</extensions>
		</Objective-C-extensions>
		<XML>
		<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
		</XML>
		<codeStyleSettings language="XML">
		<option name="FORCE_REARRANGE_MODE" value="1" />
		<indentOptions>
		<option name="CONTINUATION_INDENT_SIZE" value="4" />
		</indentOptions>
		<arrangement>
		<rules>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>xmlns:android</NAME>
		<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
		</AND>
		</match>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>xmlns:.*</NAME>
		<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
		</AND>
		</match>
		<order>BY_NAME</order>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*:id</NAME>
		<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
		</AND>
		</match>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*:name</NAME>
		<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
		</AND>
		</match>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>name</NAME>
		<XML_NAMESPACE>^$</XML_NAMESPACE>
		</AND>
		</match>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>style</NAME>
		<XML_NAMESPACE>^$</XML_NAMESPACE>
		</AND>
		</match>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*</NAME>
		<XML_NAMESPACE>^$</XML_NAMESPACE>
		</AND>
		</match>
		<order>BY_NAME</order>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*:layout_width</NAME>
		<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
		</AND>
		</match>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*:layout_height</NAME>
		<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
		</AND>
		</match>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.:layout_.</NAME>
		<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
		</AND>
		</match>
		<order>BY_NAME</order>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*:width</NAME>
		<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
		</AND>
		</match>
		<order>BY_NAME</order>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*:height</NAME>
		<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
		</AND>
		</match>
		<order>BY_NAME</order>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*</NAME>
		<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
		</AND>
		</match>
		<order>BY_NAME</order>
		</rule>
		</section>
		<section>
		<rule>
		<match>
		<AND>
		<NAME>.*</NAME>
		<XML_NAMESPACE>.*</XML_NAMESPACE>
		</AND>
		</match>
		<order>BY_NAME</order>
		</rule>
		</section>
		</rules>
		</arrangement>
		</codeStyleSettings>
		</value>
		</option>
		<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
		</component>
		</project>
		No newline at end of file

.idea/encodings.xml

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<project version="4">
		<component name="Encoding">
		<file url="PROJECT" charset="UTF-8" />
		</component>
		</project>
		No newline at end of file

.idea/gradle.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,12 @@
		<option value="$PROJECT_DIR$/app" />
		</set>
		</option>
		<option name="myModules">
		<set>
		<option value="$PROJECT_DIR$" />
		<option value="$PROJECT_DIR$/app" />
		</set>
		</option>
		</GradleProjectSettings>
		</option>
		</component>

.idea/misc.xml

+27 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<project version="4">

		<component name="EntryPointsManager">
		<entry_points version="2.0" />
		</component>
		<component name="MavenImportPreferences">
		<option name="generalSettings">
		<MavenGeneralSettings>
		@@ -8,6 +10,30 @@
		</MavenGeneralSettings>
		</option>
		</component>
		<component name="NullableNotNullManager">
		<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
		<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
		<option name="myNullables">
		<value>
		<list size="4">
		<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
		<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
		<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
		<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
		</list>
		</value>
		</option>
		<option name="myNotNulls">
		<value>
		<list size="4">
		<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
		<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
		<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
		<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
		</list>
		</value>
		</option>
		</component>
		<component name="ProjectLevelVcsManager" settingsEditedManually="false">
		<OptionsSetting value="true" id="Add" />
		<OptionsSetting value="true" id="Remove" />

app/build.gradle

+15 −6

Original line number	Diff line number	Diff line
		@@ -2,28 +2,37 @@ apply plugin: 'com.android.application'

		android {
		compileSdkVersion 23
		buildToolsVersion "23.0.1"
		buildToolsVersion '23.0.2'
		defaultConfig {
		applicationId "org.asdtm.goodweather"
		minSdkVersion 11
		targetSdkVersion 23
		versionCode 1
		versionName "1.0"
		versionCode 3
		versionName "1.2"

		}
		buildTypes {
		release {
		minifyEnabled true
		proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

		applicationVariants.all { variant ->
		variant.outputs.each { output ->
		output.outputFile = new File(
		output.outputFile.parent,
		output.outputFile.name.replace("app-release.apk", "GoodWeather-release-${variant.versionName}.apk"))
		}
		}
		}
		}
		productFlavors {
		}
		}

		dependencies {
		compile fileTree(dir: 'libs', include: ['*.jar'])
		testCompile 'junit:junit:4.12'
		compile files('libs/svg-android.jar')
		compile 'com.android.support:appcompat-v7:23.1.1'
		compile 'com.android.support:design:23.1.1'
		compile 'com.android.support:cardview-v7:23.1.1'
		compile 'com.google.android.gms:play-services-ads:8.3.0'
		compile 'com.google.android.gms:play-services-ads:8.4.0'
		}