Android Studio migration

.gitignore

@@ -1,10 +1,42 @@
-bin/*
-UI/bin/*
-UI/Demo/bin/*
-UI/Demo/gen/*
-gen/*
-.settings/*
-*.class
+.DS_Store
+
+# built application files
 *.apk
 *.ap_
-libs/*
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+apk/
+
+# imported libraries
+libs/
+
+# Local configuration file (sdk path, etc)
+local.properties
+.settings
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+.idea/
+.gradle
+gradle
+/*/local.properties
+/*/out
+/*/*/build
+build
+/*/*/production
+*.iml
+*.iws
+*.ipr
+*~
+*.swp

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "UI/color-picker"]
-	path = UI/color-picker
+[submodule "color-picker"]
+	path = color-picker
 	url = https://github.com/dmfs/color-picker.git

Demo/build.gradle

@@ -0,0 +1,23 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        applicationId "com.schedjoules.demo"
+        minSdkVersion 14
+        targetSdkVersion 19
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles 'proguard.cfg'
+        }
+    }
+}
+
+dependencies {
+    compile project(':UI')
+}

UI/Demo/AndroidManifest.xml → Demo/src/main/AndroidManifest.xml

@@ -3,11 +3,11 @@
     package="com.schedjoules.demo"
     android:installLocation="internalOnly"
     android:versionCode="106"
-    android:versionName="1" >
+    android:versionName="1">
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="com.android.vending.BILLING" />
@@ -24,7 +24,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    
+
     <!-- GCM permissions -->
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
@@ -38,10 +38,11 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name="org.dmfs.webcal.MainActivity"
-            android:label="@string/title_activity_home" >
+            android:label="@string/title_activity_home"
+            android:theme="@style/AppThemeToolBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -50,12 +51,11 @@
         </activity>
         <activity
             android:name="org.dmfs.webcal.CalCategActivity"
-            android:label="@string/app_name" >
-        </activity>
+            android:label="@string/app_name"></activity>
         <activity
             android:name="org.dmfs.webcal.EventsPreviewActivity"
             android:label="@string/activity_title_events_preview"
-            android:parentActivityName="org.dmfs.webcal.MainActivity" >
+            android:parentActivityName="org.dmfs.webcal.MainActivity">
 
             <!-- Parent activity meta-data to support 4.0 and lower -->
             <meta-data
@@ -64,7 +64,7 @@
         </activity>
         <activity
             android:name="org.dmfs.webcal.DummyAuthenticatorActivity"
-            android:label="@string/activity_title_events_preview" >
+            android:label="@string/activity_title_events_preview">
             <intent-filter>
                 <action android:name="org.dmfs.android.authenticator.action.ADD_ACCOUNT" />
 
@@ -75,7 +75,7 @@
         <service
             android:name="org.dmfs.caldav.syncadapter.SyncService"
             android:exported="true"
-            android:process=":sync" >
+            android:process=":sync">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
@@ -87,7 +87,7 @@
         <service
             android:name="org.dmfs.android.authenticator.AuthenticationService"
             android:exported="true"
-            android:process=":auth" >
+            android:process=":auth">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
@@ -98,32 +98,28 @@
         </service>
         <service
             android:name="org.dmfs.webcal.utils.EmptyService"
-            android:exported="false" >
-        </service>
+            android:exported="false"></service>
 
         <provider
             android:name="org.dmfs.android.calendarcontent.provider.CalendarContentProvider"
             android:authorities="com.schedjoules.demo.calendarcontentprovider"
             android:enabled="true"
             android:exported="false"
             android:multiprocess="@bool/content_provider_multi_process"
-            android:process=":provider" >
-        </provider>
+            android:process=":provider"></provider>
         <provider
             android:name="org.dmfs.android.webcalreader.provider.WebCalReaderProvider"
             android:authorities="com.schedjoules.demo.webcalreaderprovider"
             android:enabled="true"
             android:exported="false"
             android:multiprocess="@bool/content_provider_multi_process"
-            android:process=":previewprovider" >
-        </provider>
+            android:process=":previewprovider"></provider>
 
         <activity
             android:name="org.dmfs.webcal.PreferencesActivity"
-            android:label="@string/title_activity_preferences" >
-        </activity>
+            android:label="@string/title_activity_preferences"></activity>
 
-        <receiver android:name="org.dmfs.android.calendarcontent.provider.OnBootReceiver" >
+        <receiver android:name="org.dmfs.android.calendarcontent.provider.OnBootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />

UI/build.gradle

@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion '21.1.2'
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 19
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:21.0.+'
+    compile 'com.google.android.gms:play-services:7.0.0'
+    compile files('libs/android-retention-magic-1.2.2.jar')
+    compile files('libs/async-tools-1.1.jar')
+    compile files('libs/schedjoules-sdk.jar')
+    compile project(':colorpicker')
+}