Skip to content

Commit

Permalink
mergin
Browse files Browse the repository at this point in the history
  • Loading branch information
Codeskraps committed Mar 10, 2013
2 parents 164c9e6 + acc6e36 commit 3bfe8e0
Show file tree
Hide file tree
Showing 45 changed files with 4,612 additions and 264 deletions.
5 changes: 4 additions & 1 deletion .classpath
Expand Up @@ -3,7 +3,10 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="lib" path="libs/acra-4.2.3.jar"/>
<classpathentry kind="lib" path="libs/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="libs/scribe-1.3.0.jar"/>
<classpathentry kind="lib" path="libs/gson-2.2.2.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
34 changes: 20 additions & 14 deletions AndroidManifest.xml
@@ -1,38 +1,44 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.codeskraps.lolo"
android:versionCode="18"
android:versionName="1.17" >
android:versionCode="20"
android:versionName="2.0" >

<!-- Remember to update the info code version -->

<uses-sdk
android:minSdkVersion="7"
android:targetSdkVersion="15" />
android:minSdkVersion="14"
android:targetSdkVersion="17" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<application
android:name=".LoloApp"
android:name=".home.LoloApp"
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name=".PrefsActivity"
android:theme="@android:style/Theme.Light.NoTitleBar" >
android:theme="@android:style/Theme.Holo.Light.DarkActionBar" >
<activity android:name=".home.PrefsActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>
</activity>
<activity android:name=".twitter.TwitterSignInActivity" />
<activity android:name=".twitter.TwitterAccountActivity" />
<activity android:name=".twitter.TweetActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".home.AddAcount" />
<activity
android:name=".AboutActivity"
android:name=".home.AboutActivity"
android:theme="@style/Theme.Translucent" />

<receiver
android:name=".LoloProvider"
android:name=".home.LoloProvider"
android:exported="true" >
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
Expand All @@ -43,14 +49,14 @@
android:resource="@xml/loloinfo" />
</receiver>
<receiver
android:name=".LoloProvider"
android:name=".home.LoloProvider"
android:exported="false" >
<intent-filter>
<action android:name="com.codeskraps.lolo.FORCE_WIDGET_UPDATE" />
</intent-filter>
</receiver>
<receiver
android:name=".UpdateWidgetReceiver"
android:name=".home.UpdateWidgetReceiver"
android:exported="false" >
<intent-filter>
<action android:name="com.codeskraps.lolo.BROADCAST_RECEIVER" />
Expand Down
5 changes: 4 additions & 1 deletion README.rdoc
Expand Up @@ -4,7 +4,7 @@
* <b>Git:</b> https://github.com/091labs/lo-lo
* <b>Author:</b> 091 Labs members
* <b>License:</b> GNU GPL v3
* <b>Latest Version:</b> 1.17
* <b>Latest Version:</b> 1.18
* <b>Release Date:</b> 2012

== General Infromation
Expand All @@ -31,6 +31,9 @@ Install from Google Play
* http://play.google.com/store/apps/details?id=com.codeskraps.lolo

== ChangeLog
<b>v1.18</b>
* Changed initial image of widget to no signal

<b>v1.17</b>
* No signal image changed

Expand Down
Binary file removed libs/android-support-v4.jar
Binary file not shown.
Binary file added libs/commons-codec-1.7.jar
Binary file not shown.
Binary file added libs/gson-2.2.2.jar
Binary file not shown.
Binary file added libs/scribe-1.3.0.jar
Binary file not shown.
Binary file added res/drawable-hdpi/alerts_and_states_error.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/alerts_and_states_error.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/alerts_and_states_error.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions res/layout/facebook_signin.xml
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#FF0000" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/twi_help"
android:textColor="#444444" />

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="5dp"
android:background="#555" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="@string/twi_stepone"
android:textAppearance="@android:style/TextAppearance.Holo.Large" />

<Button
android:id="@+id/fac_btn_goto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/twi_goto" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/twi_steptwo"
android:textAppearance="@android:style/TextAppearance.Holo.Large" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="10dp"
android:text="@string/twi_enterkey"
android:textColor="#444444" />

<EditText
android:id="@+id/fac_etxt_key"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:inputType="number"
android:minHeight="40dp"
android:singleLine="true" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal" >

<Button
android:id="@+id/fac_cancel"
style="@android:attr/buttonBarStyle"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:text="@string/cancel" />

<Button
android:id="@+id/fac_submit"
style="@android:attr/buttonBarStyle"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:text="@string/twi_submit" />
</LinearLayout>

</LinearLayout>
7 changes: 3 additions & 4 deletions res/layout/header.xml
Expand Up @@ -19,14 +19,13 @@
android:layout_marginTop="15dp"
android:text="@string/app_name"
android:textColor="#AAAAAA"
android:textSize="25dp"
android:textSize="25sp"
android:typeface="normal" />
</LinearLayout>

<LinearLayout
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#FF0000"
android:orientation="horizontal" />
android:background="#FF0000" />

</merge>
6 changes: 3 additions & 3 deletions res/layout/prefs.xml
Expand Up @@ -4,10 +4,10 @@
android:layout_height="match_parent"
android:orientation="vertical" >

<include
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
layout="@layout/header" />
android:layout_height="1dp"
android:background="#FF0000" />

<ListView
android:id="@android:id/list"
Expand Down
36 changes: 36 additions & 0 deletions res/layout/tweet.xml
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="right"
android:orientation="vertical" >

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#FF0000" />

<EditText
android:id="@+id/twe_etxt_data"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_margin="10dp"
android:gravity="top"
android:hint="@string/twe_enter"
android:inputType="text" />

<TextView
android:id="@+id/twe_txt_feedback"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textIsSelectable="false" />

<Button
android:id="@+id/twe_btn_submit"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="@string/twi_submit" />

</LinearLayout>
29 changes: 29 additions & 0 deletions res/layout/twitter_account.xml
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#FF0000" />

<ImageView
android:id="@+id/tac_img_user"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginTop="10dp"
android:layout_margin="10dp"
android:contentDescription="@string/contentDescription" />

<TextView
android:id="@+id/tac_txt_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textAppearance="@android:style/TextAppearance.Holo.Large"
android:textColor="#444444"
android:textIsSelectable="false" />

</LinearLayout>
88 changes: 88 additions & 0 deletions res/layout/twitter_signin.xml
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#FF0000" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/twi_help"
android:textColor="#444444" />

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="5dp"
android:background="#555" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="@string/twi_stepone"
android:textAppearance="@android:style/TextAppearance.Holo.Large" />

<Button
android:id="@+id/twi_btn_goto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/twi_goto" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/twi_steptwo"
android:textAppearance="@android:style/TextAppearance.Holo.Large" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="10dp"
android:text="@string/twi_enterkey"
android:textColor="#444444" />

<EditText
android:id="@+id/twi_etxt_key"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:inputType="number"
android:minHeight="40dp"
android:singleLine="true" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal" >

<Button
android:id="@+id/twi_cancel"
style="@android:attr/buttonBarStyle"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:text="@string/cancel" />

<Button
android:id="@+id/twi_submit"
style="@android:attr/buttonBarStyle"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:text="@string/twi_submit" />
</LinearLayout>

</LinearLayout>

0 comments on commit 3bfe8e0

Please sign in to comment.