We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Skip to content

GitLab

G
gnu-fm
Commit 9bf7fd73 authored by Mike Sheldon's avatar Mike Sheldon
Browse files
Options

Begin to make it possible add custom stations to libre droid by switching to a... 

Begin to make it possible add custom stations to libre droid by switching to a list view for tag stations (not yet fully functional)
Update Libre.fm branding to use Pablo's new logos
parent e465f70f
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 86 deletions
clients/libredroid/gen/fm/libre/droid/R.java
View file @ 9bf7fd73
......@@ -23,42 +23,45 @@ public final class R {
public static final int prev=0x7f020009;
public static final int quit=0x7f02000a;
public static final int save=0x7f02000b;
public static final int tower=0x7f02000c;
}
public static final class id {
public static final int ImageView01=0x7f050004;
public static final int LinearLayout01=0x7f050000;
public static final int ScrollView01=0x7f050001;
public static final int TableLayout01=0x7f05000e;
public static final int TableLayout02=0x7f050013;
public static final int ScrollView01=0x7f050002;
public static final int ScrollView02=0x7f05000e;
public static final int ScrollView03=0x7f050013;
public static final int StationLayout=0x7f05000f;
public static final int TableLayout02=0x7f050014;
public static final int TableLayout03=0x7f050003;
public static final int TableRow01=0x7f050010;
public static final int TableRow02=0x7f050011;
public static final int TableRow03=0x7f050012;
public static final int TableRow04=0x7f050018;
public static final int TextView01=0x7f05000f;
public static final int TableRow02=0x7f050019;
public static final int TextView02=0x7f050007;
public static final int TextView03=0x7f050009;
public static final int TextView04=0x7f05000d;
public static final int TextView05=0x7f05000c;
public static final int TextView06=0x7f050005;
public static final int TextView07=0x7f050006;
public static final int albumImage=0x7f050015;
public static final int artistText=0x7f050017;
public static final int banButton=0x7f050019;
public static final int albumImage=0x7f050016;
public static final int artistText=0x7f050018;
public static final int banButton=0x7f05001a;
public static final int communityStationButton=0x7f050012;
public static final int loginButton=0x7f05000b;
public static final int loveButton=0x7f05001e;
public static final int nextButton=0x7f05001c;
public static final int loveButton=0x7f05001f;
public static final int loveStationButton=0x7f050011;
public static final int nextButton=0x7f05001d;
public static final int passwordEntry=0x7f05000a;
public static final int playPauseButton=0x7f05001b;
public static final int prevButton=0x7f05001a;
public static final int saveButton=0x7f05001d;
public static final int stationNameText=0x7f050014;
public static final int titleText=0x7f050016;
public static final int playPauseButton=0x7f05001c;
public static final int prevButton=0x7f05001b;
public static final int saveButton=0x7f05001e;
public static final int stationNameText=0x7f050015;
public static final int tagStationButton=0x7f050010;
public static final int titleText=0x7f050017;
public static final int usernameEntry=0x7f050008;
public static final int viewAnimator=0x7f050002;
public static final int viewAnimator=0x7f050001;
}
public static final class layout {
public static final int main=0x7f030000;
public static final int list_item=0x7f030000;
public static final int main=0x7f030001;
}
public static final class string {
public static final int app_name=0x7f040001;
......
clients/libredroid/res/layout/main.xml
View file @ 9bf7fd73
......@@ -3,41 +3,36 @@
<LinearLayout android:id="@+id/LinearLayout01" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android">
<ScrollView android:id="@+id/ScrollView01" android:layout_height="wrap_content" android:layout_width="fill_parent"><ViewAnimator android:layout_height="wrap_content" android:id="@+id/viewAnimator" android:layout_width="fill_parent"><TableLayout android:id="@+id/TableLayout03" android:layout_height="wrap_content" android:layout_width="fill_parent"><ImageView android:id="@+id/ImageView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="5px" android:src="@drawable/logo"></ImageView><TextView android:id="@+id/TextView06" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Libre.fm account details:" android:textStyle="bold" android:layout_marginTop="10px" android:layout_marginBottom="0px"></TextView><TextView android:id="@+id/TextView07" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="(This is not the same as your Google account)" android:layout_marginBottom="10px"></TextView><TextView android:id="@+id/TextView02" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Username:"></TextView><EditText android:layout_height="wrap_content" android:layout_width="fill_parent" android:id="@+id/usernameEntry" android:singleLine="true"></EditText><TextView android:id="@+id/TextView03" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Password:" android:layout_marginTop="10px"></TextView><EditText android:layout_width="wrap_content" android:layout_height="wrap_content" android:password="true" android:id="@+id/passwordEntry" android:singleLine="true"></EditText>
<Button android:layout_width="wrap_content" android:id="@+id/loginButton" android:text="Login" android:layout_height="wrap_content" android:layout_marginTop="20px"></Button>
<TextView android:id="@+id/TextView05" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Don't have an account?" android:layout_marginTop="20px" android:textStyle="bold"></TextView><TextView android:id="@+id/TextView04" android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web" android:clickable="true" android:text="Visit www.libre.fm to sign up for a free account."></TextView>
</TableLayout>
<TableLayout android:id="@+id/TableLayout01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:visibility="visible"><ImageView android:id="@+id/ImageView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="5px" android:src="@drawable/logo"></ImageView><TextView android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Stations Tagged With:" android:textStyle="bold"></TextView><TableRow android:id="@+id/TableRow01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="10px" android:gravity="center_horizontal"></TableRow>
<TableRow android:id="@+id/TableRow02" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal"></TableRow>
<TableRow android:id="@+id/TableRow03" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal"></TableRow>
</TableLayout>
<TableLayout android:id="@+id/TableLayout02" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" android:layout_gravity="center_horizontal"><ImageView android:id="@+id/ImageView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="5px" android:src="@drawable/logo"></ImageView><TextView android:layout_height="wrap_content" android:id="@+id/stationNameText" android:textStyle="bold" android:layout_gravity="center_horizontal" android:layout_width="fill_parent" android:gravity="center_horizontal"></TextView><ImageView android:layout_height="wrap_content" android:id="@+id/albumImage" android:src="@drawable/album" android:layout_width="fill_parent" android:layout_marginTop="10px"></ImageView><TextView android:layout_height="wrap_content" android:id="@+id/titleText" style="bold" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_gravity="center_horizontal" android:layout_marginTop="5px" android:textSize="7pt" android:maxLines="2"></TextView><TextView android:layout_height="wrap_content" android:id="@+id/artistText" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_gravity="center_horizontal" android:maxLines="2"></TextView>
<TableRow android:id="@+id/TableRow04" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="10px" android:layout_gravity="center_horizontal" android:gravity="center_horizontal">
<ImageButton android:layout_height="wrap_content" android:id="@+id/banButton" android:src="@drawable/ban" android:layout_width="fill_parent" android:layout_marginRight="1px"></ImageButton>
<ImageButton android:layout_height="wrap_content" android:id="@+id/prevButton" android:src="@drawable/prev" android:layout_width="fill_parent"></ImageButton>
<ImageButton android:layout_height="wrap_content" android:src="@drawable/pause" android:id="@+id/playPauseButton" android:layout_width="fill_parent"></ImageButton><ImageButton android:layout_height="wrap_content" android:id="@+id/nextButton" android:src="@drawable/next" android:layout_width="fill_parent"></ImageButton>
<ImageButton android:layout_height="wrap_content" android:id="@+id/saveButton" android:src="@drawable/save" android:layout_width="fill_parent"></ImageButton>
<ImageButton android:layout_height="wrap_content" android:id="@+id/loveButton" android:src="@drawable/love" android:layout_width="fill_parent"></ImageButton>
</TableRow>
</TableLayout>
</ViewAnimator></ScrollView>
<ViewAnimator android:layout_height="fill_parent" android:id="@+id/viewAnimator" android:layout_width="fill_parent">
<ScrollView android:id="@+id/ScrollView01" android:layout_height="fill_parent" android:layout_width="fill_parent">
<TableLayout android:id="@+id/TableLayout03" android:layout_height="wrap_content" android:layout_width="fill_parent"><ImageView android:id="@+id/ImageView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="10px" android:src="@drawable/logo"></ImageView><TextView android:id="@+id/TextView06" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Libre.fm account details:" android:textStyle="bold" android:layout_marginTop="10px" android:layout_marginBottom="0px"></TextView><TextView android:id="@+id/TextView07" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="(This is not the same as your Google account)" android:layout_marginBottom="10px"></TextView><TextView android:id="@+id/TextView02" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Username:"></TextView><EditText android:layout_height="wrap_content" android:layout_width="fill_parent" android:id="@+id/usernameEntry" android:singleLine="true"></EditText><TextView android:id="@+id/TextView03" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Password:" android:layout_marginTop="10px"></TextView><EditText android:layout_width="wrap_content" android:layout_height="wrap_content" android:password="true" android:id="@+id/passwordEntry" android:singleLine="true"></EditText>
<Button android:layout_width="wrap_content" android:id="@+id/loginButton" android:text="Login" android:layout_height="wrap_content" android:layout_marginTop="20px"></Button>
<TextView android:id="@+id/TextView05" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Don't have an account?" android:layout_marginTop="20px" android:textStyle="bold"></TextView><TextView android:id="@+id/TextView04" android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web" android:clickable="true" android:text="Visit www.libre.fm to sign up for a free account."></TextView>
</TableLayout>
</ScrollView>
<ScrollView android:id="@+id/ScrollView02" android:layout_height="fill_parent" android:layout_width="fill_parent">
<TableLayout android:id="@+id/StationLayout" android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent" android:visibility="visible">
<ImageView android:id="@+id/ImageView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="10px" android:layout_marginBottom="10px" android:src="@drawable/tower"></ImageView>
<Button android:layout_width="wrap_content" android:id="@+id/tagStationButton" android:text="Tag Stations" android:layout_height="wrap_content"></Button>
<Button android:layout_width="wrap_content" android:id="@+id/loveStationButton" android:text="Your Loved Tracks" android:layout_height="wrap_content"></Button>
<Button android:layout_width="wrap_content" android:id="@+id/communityStationButton" android:text="Community's Loved Tracks" android:layout_height="wrap_content"></Button>
</TableLayout>
</ScrollView>
<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_height="fill_parent"/>
<ScrollView android:id="@+id/ScrollView03" android:layout_height="fill_parent" android:layout_width="fill_parent">
<TableLayout android:id="@+id/TableLayout02" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" android:layout_gravity="center_horizontal"><ImageView android:id="@+id/ImageView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="10px" android:src="@drawable/logo"></ImageView><TextView android:layout_height="wrap_content" android:id="@+id/stationNameText" android:textStyle="bold" android:layout_gravity="center_horizontal" android:layout_width="fill_parent" android:gravity="center_horizontal"></TextView><ImageView android:layout_height="wrap_content" android:id="@+id/albumImage" android:src="@drawable/album" android:layout_width="fill_parent" android:layout_marginTop="10px"></ImageView><TextView android:layout_height="wrap_content" android:id="@+id/titleText" style="bold" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_gravity="center_horizontal" android:layout_marginTop="5px" android:textSize="7pt" android:maxLines="2"></TextView><TextView android:layout_height="wrap_content" android:id="@+id/artistText" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_gravity="center_horizontal" android:maxLines="2"></TextView>
<TableRow android:id="@+id/TableRow02" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginTop="10px" android:layout_gravity="center_horizontal" android:gravity="center_horizontal">
<ImageButton android:layout_height="wrap_content" android:id="@+id/banButton" android:src="@drawable/ban" android:layout_width="fill_parent" android:layout_marginRight="1px"></ImageButton>
<ImageButton android:layout_height="wrap_content" android:id="@+id/prevButton" android:src="@drawable/prev" android:layout_width="fill_parent"></ImageButton>
<ImageButton android:layout_height="wrap_content" android:src="@drawable/pause" android:id="@+id/playPauseButton" android:layout_width="fill_parent"></ImageButton><ImageButton android:layout_height="wrap_content" android:id="@+id/nextButton" android:src="@drawable/next" android:layout_width="fill_parent"></ImageButton>
<ImageButton android:layout_height="wrap_content" android:id="@+id/saveButton" android:src="@drawable/save" android:layout_width="fill_parent"></ImageButton>
<ImageButton android:layout_height="wrap_content" android:id="@+id/loveButton" android:src="@drawable/love" android:layout_width="fill_parent"></ImageButton>
</TableRow>
</TableLayout>
</ScrollView>
</ViewAnimator>
</LinearLayout>
\ No newline at end of file
clients/libredroid/src/fm/libre/droid/LibreDroid.java
View file @ 9bf7fd73
......@@ -47,6 +47,7 @@ import org.apache.http.message.BasicNameValuePair;
import org.apache.http.params.CoreProtocolPNames;
import android.app.Activity;
import android.app.ListActivity;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
......@@ -70,17 +71,21 @@ import android.view.MenuItem;
import android.view.View;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View.OnClickListener;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TableLayout;
import android.widget.TableRow;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ViewAnimator;
public class LibreDroid extends Activity {
public class LibreDroid extends ListActivity {
private LibreServiceConnection libreServiceConn;
private String username;
private String password;
......@@ -95,7 +100,7 @@ public class LibreDroid extends Activity {
this.registerReceiver(new MediaButtonReceiver(), new IntentFilter(Intent.ACTION_MEDIA_BUTTON));
this.registerReceiver(new UIUpdateReceiver(), new IntentFilter("LibreDroidNewSong"));
setContentView(R.layout.main);
// Load settings
final SharedPreferences settings = getSharedPreferences("LibreDroid", MODE_PRIVATE);
username = settings.getString("Username", "");
......@@ -120,45 +125,33 @@ public class LibreDroid extends Activity {
// Setup buttons
String radioButtons[] = { "Folk", "Rock", "Metal", "Classical", "Pop",
"Punk", "Jazz", "Blues", "Rap", "Ambient" };
int i = 0;
TableRow row = (TableRow) findViewById(R.id.TableRow01);
for (String buttonStr : radioButtons) {
Button button = new Button(this);
button.setText(buttonStr);
button.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
Button b = (Button) v;
LibreDroid.this.libreServiceConn.service.tuneStation("globaltags", b.getText().toString().toLowerCase());
LibreDroid.this.nextPage();
}
});
row.addView(button);
i++;
if (i == 5) {
row = (TableRow) findViewById(R.id.TableRow02);
"Punk", "Jazz", "Blues", "Rap", "Ambient", "Add A Custom Station..." };
setListAdapter(new ArrayAdapter<String>(this, R.layout.list_item, radioButtons));
Button tagStation = (Button) findViewById(R.id.tagStationButton);
tagStation.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
LibreDroid.this.nextPage();
}
}
TableLayout table = (TableLayout) findViewById(R.id.TableLayout01);
Button loveStation = new Button(this);
loveStation.setText("Your Loved Tracks");
});
Button loveStation = (Button) findViewById(R.id.loveStationButton);
loveStation.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
LibreDroid.this.libreServiceConn.service.tuneStation("user", username + "/loved");
LibreDroid.this.nextPage();
LibreDroid.this.nextPage();
}
});
table.addView(loveStation);
Button communityLoveStation = new Button(this);
communityLoveStation.setText("Community's Loved Tracks");
Button communityLoveStation = (Button) findViewById(R.id.communityStationButton);
communityLoveStation.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
LibreDroid.this.libreServiceConn.service.tuneStation("community", "loved");
LibreDroid.this.nextPage();
LibreDroid.this.nextPage();
}
});
table.addView(communityLoveStation);
final ImageButton nextButton = (ImageButton) findViewById(R.id.nextButton);
nextButton.setOnClickListener(new OnClickListener() {
......@@ -225,8 +218,12 @@ public class LibreDroid extends Activity {
public boolean onKeyDown(int keyCode, KeyEvent event) {
if ((keyCode == KeyEvent.KEYCODE_BACK)) {
if (this.libreServiceConn.service.getCurrentPage() > 0) {
LibreDroid.this.libreServiceConn.service.stop();
if(this.libreServiceConn.service.getCurrentPage() == 3) {
// Back two pages if we're on the player page to get back to the main menu
this.prevPage();
}
this.prevPage();
LibreDroid.this.libreServiceConn.service.stop();
return true;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

git.gnu.io is graciously hosted by the Free Software Foundation. https://donate.fsf.org