Skip to content

Commit 031e5f8

Browse files
author
sidzi
committed
refactoring and UI improvements
1 parent 0738ae7 commit 031e5f8

25 files changed

+82
-83
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
android:theme="@style/AppTheme"
1717
tools:ignore="GoogleAppIndexingWarning">
1818
<activity
19-
android:name=".ui.MainActivity"
19+
android:name=".activities.MainActivity"
2020
android:label="@string/title_activity_main"
2121
android:launchMode="singleTask"
2222
android:screenOrientation="portrait"
@@ -47,26 +47,26 @@
4747
</receiver>
4848

4949
<activity
50-
android:name=".ui.EosActivity"
50+
android:name=".activities.EosActivity"
5151
android:configChanges="orientation|keyboardHidden|screenSize"
5252
android:label="@string/title_activity_eos"
5353
android:theme="@style/FullscreenTheme" />
5454
<activity
55-
android:name=".ui.SearchActivity"
55+
android:name=".activities.SearchActivity"
5656
android:label="@string/title_activity_search"
5757
android:screenOrientation="portrait"
5858
android:theme="@style/AppTheme.NoActionBar" />
59-
<activity android:name=".ui.AlarmSettingActivity" />
59+
<activity android:name=".activities.AlarmSettingActivity" />
6060

6161
<receiver android:name=".receivers.AlarmReceiver" />
6262

6363
<activity
64-
android:name=".ui.AlarmActivity"
64+
android:name=".activities.AlarmActivity"
6565
android:configChanges="orientation|keyboardHidden|screenSize"
6666
android:label="@string/title_activity_alarm"
6767
android:theme="@style/FullscreenTheme" />
6868

69-
<activity android:name=".ui.ListFileActivity" />
69+
<activity android:name=".activities.ListFileActivity" />
7070
</application>
7171

7272
</manifest>

‎app/src/main/java/com/sidzi/circleofmusic/ui/AlarmActivity.java renamed to ‎app/src/main/java/com/sidzi/circleofmusic/activities/AlarmActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sidzi.circleofmusic.ui;
1+
package com.sidzi.circleofmusic.activities;
22

33
import android.annotation.SuppressLint;
44
import android.media.AudioManager;

‎app/src/main/java/com/sidzi/circleofmusic/ui/AlarmSettingActivity.java renamed to ‎app/src/main/java/com/sidzi/circleofmusic/activities/AlarmSettingActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sidzi.circleofmusic.ui;
1+
package com.sidzi.circleofmusic.activities;
22

33
import android.app.AlarmManager;
44
import android.app.DownloadManager;

‎app/src/main/java/com/sidzi/circleofmusic/ui/EosActivity.java renamed to ‎app/src/main/java/com/sidzi/circleofmusic/activities/EosActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sidzi.circleofmusic.ui;
1+
package com.sidzi.circleofmusic.activities;
22

33
import android.annotation.SuppressLint;
44
import android.app.DownloadManager;

‎app/src/main/java/com/sidzi/circleofmusic/ui/ListFileActivity.java renamed to ‎app/src/main/java/com/sidzi/circleofmusic/activities/ListFileActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sidzi.circleofmusic.ui;
1+
package com.sidzi.circleofmusic.activities;
22

33
import android.content.Intent;
44
import android.os.Build;

‎app/src/main/java/com/sidzi/circleofmusic/ui/MainActivity.java renamed to ‎app/src/main/java/com/sidzi/circleofmusic/activities/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sidzi.circleofmusic.ui;
1+
package com.sidzi.circleofmusic.activities;
22

33
import android.Manifest;
44
import android.app.ProgressDialog;

‎app/src/main/java/com/sidzi/circleofmusic/ui/SearchActivity.java renamed to ‎app/src/main/java/com/sidzi/circleofmusic/activities/SearchActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sidzi.circleofmusic.ui;
1+
package com.sidzi.circleofmusic.activities;
22

33
import android.os.Bundle;
44
import android.support.v7.app.AppCompatActivity;

‎app/src/main/java/com/sidzi/circleofmusic/fragments/TheFifthFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
import android.view.ViewGroup;
1515

1616
import com.sidzi.circleofmusic.R;
17+
import com.sidzi.circleofmusic.activities.ListFileActivity;
1718
import com.sidzi.circleofmusic.adapters.ComTracksAdapter;
1819
import com.sidzi.circleofmusic.helpers.FileUploader;
1920
import com.sidzi.circleofmusic.helpers.VerticalSpaceDecorationHelper;
20-
import com.sidzi.circleofmusic.ui.ListFileActivity;
2121

2222
import java.io.File;
2323

‎app/src/main/java/com/sidzi/circleofmusic/receivers/MusicPlayerViewHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import android.widget.Toast;
1919

2020
import com.sidzi.circleofmusic.R;
21+
import com.sidzi.circleofmusic.activities.MainActivity;
2122
import com.sidzi.circleofmusic.entities.Track;
2223
import com.sidzi.circleofmusic.services.MusicPlayerService;
23-
import com.sidzi.circleofmusic.ui.MainActivity;
2424

2525
import static android.content.Context.NOTIFICATION_SERVICE;
2626

‎app/src/main/res/layout/activity_alarm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:background="#005D5D"
6-
tools:context="com.sidzi.circleofmusic.ui.AlarmActivity">
6+
tools:context="com.sidzi.circleofmusic.activities.AlarmActivity">
77

88
<!-- The primary full-screen view. This can be replaced with whatever view
99
is needed to present your content, e.g. VideoView, SurfaceView,

‎app/src/main/res/layout/activity_alarm_setting.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:paddingLeft="@dimen/activity_horizontal_margin"
99
android:paddingRight="@dimen/activity_horizontal_margin"
1010
android:paddingTop="@dimen/activity_vertical_margin"
11-
tools:context="com.sidzi.circleofmusic.ui.AlarmSettingActivity">
11+
tools:context="com.sidzi.circleofmusic.activities.AlarmSettingActivity">
1212

1313
<TextView
1414
android:id="@+id/tvLabel"

‎app/src/main/res/layout/activity_eos.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:background="@color/primary"
6-
tools:context="com.sidzi.circleofmusic.ui.EosActivity">
6+
tools:context="com.sidzi.circleofmusic.activities.EosActivity">
77

88
<!-- The primary full-screen view. This can be replaced with whatever view
99
is needed to present your content, e.g. VideoView, SurfaceView,

‎app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:layout_height="match_parent"
88
android:animateLayoutChanges="true"
99
android:fitsSystemWindows="true"
10-
tools:context="com.sidzi.circleofmusic.ui.MainActivity">
10+
tools:context="com.sidzi.circleofmusic.activities.MainActivity">
1111

1212
<android.support.design.widget.AppBarLayout
1313
android:id="@+id/appbar"

‎app/src/main/res/layout/activity_search.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:fitsSystemWindows="true"
8-
tools:context="com.sidzi.circleofmusic.ui.SearchActivity">
8+
tools:context="com.sidzi.circleofmusic.activities.SearchActivity">
99

1010
<android.support.design.widget.AppBarLayout
1111
android:layout_width="match_parent"

‎app/src/main/res/layout/chat_controls.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/rlChatControls"
4+
android:layout_width="match_parent"
5+
android:layout_height="wrap_content"
6+
android:layout_gravity="bottom"
7+
android:orientation="horizontal"
8+
android:paddingBottom="@dimen/activity_vertical_margin"
9+
android:paddingTop="@dimen/activity_vertical_margin"
10+
android:weightSum="1">
11+
12+
<EditText
13+
android:id="@+id/etChatMessage"
14+
android:layout_width="0dp"
15+
android:layout_height="wrap_content"
16+
android:layout_gravity="start"
17+
android:layout_weight="0.9" />
18+
19+
<ImageButton
20+
android:id="@+id/ibSendMessage"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_gravity="end"
24+
android:layout_weight=".1"
25+
android:background="@android:color/transparent"
26+
android:contentDescription="@string/send_message"
27+
android:src="@drawable/ic_send" />
28+
</LinearLayout>

‎app/src/main/res/layout/content_search.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:paddingRight="@dimen/activity_horizontal_margin"
1111
android:paddingTop="@dimen/activity_vertical_margin"
1212
app:layout_behavior="@string/appbar_scrolling_view_behavior"
13-
tools:context="com.sidzi.circleofmusic.ui.SearchActivity"
13+
tools:context="com.sidzi.circleofmusic.activities.SearchActivity"
1414
tools:showIn="@layout/activity_search">
1515

1616
<android.support.v7.widget.RecyclerView

‎app/src/main/res/layout/fragment_chat_bot.xml

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:orientation="vertical"
7-
tools:context="com.sidzi.circleofmusic.ui.MainActivity$PlaceholderFragment">
8-
9-
10-
<RelativeLayout
11-
android:id="@+id/rlChatControls"
12-
android:layout_width="match_parent"
13-
android:layout_height="wrap_content"
14-
android:layout_alignParentBottom="true"
15-
android:orientation="horizontal">
16-
17-
<ImageButton
18-
android:id="@+id/ibSendMessage"
19-
android:layout_width="wrap_content"
20-
android:layout_height="wrap_content"
21-
android:layout_alignParentEnd="true"
22-
android:background="@android:color/transparent"
23-
android:contentDescription="@string/send_message"
24-
android:paddingBottom="@dimen/activity_vertical_margin"
25-
android:paddingLeft="@dimen/activity_horizontal_margin"
26-
android:paddingRight="@dimen/activity_horizontal_margin"
27-
android:paddingTop="@dimen/activity_vertical_margin"
28-
android:src="@drawable/ic_send" />
29-
30-
<EditText
31-
android:id="@+id/etChatMessage"
32-
android:layout_width="wrap_content"
33-
android:layout_height="wrap_content"
34-
android:layout_alignParentStart="true"
35-
android:layout_toStartOf="@+id/ibSendMessage"
36-
android:paddingBottom="@dimen/activity_vertical_margin"
37-
android:paddingLeft="@dimen/activity_horizontal_margin"
38-
android:paddingRight="@dimen/activity_horizontal_margin"
39-
android:paddingTop="@dimen/activity_vertical_margin" />
40-
</RelativeLayout>
7+
tools:context="com.sidzi.circleofmusic.activities.MainActivity">
418

429
<android.support.v7.widget.RecyclerView
4310
android:id="@+id/rvChatConsole"
4411
android:layout_width="match_parent"
4512
android:layout_height="match_parent"
46-
android:layout_above="@+id/rlChatControls"
13+
android:layout_marginBottom="@dimen/ic_size"
4714
android:paddingLeft="@dimen/activity_horizontal_margin"
4815
android:paddingRight="@dimen/activity_horizontal_margin" />
4916

50-
51-
</RelativeLayout>
17+
<include layout="@layout/chat_controls" />
18+
</FrameLayout>

‎app/src/main/res/layout/fragment_track_list.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:paddingBottom="60dp"
6-
tools:context="com.sidzi.circleofmusic.ui.MainActivity$PlaceholderFragment">
6+
tools:context="com.sidzi.circleofmusic.activities.MainActivity">
77

88
<android.support.v7.widget.RecyclerView
99
android:id="@+id/rVTrackList"

‎app/src/main/res/layout/playback_panel.xml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
android:id="@+id/llPlayerPanel"
45
android:layout_width="match_parent"
56
android:layout_height="wrap_content"
67
android:layout_gravity="bottom"
78
android:background="@color/primary"
8-
android:weightSum="3">
9+
android:paddingBottom="@dimen/activity_vertical_margin"
10+
android:paddingTop="@dimen/activity_vertical_margin"
11+
android:weightSum="3"
12+
tools:ignore="HardcodedText">
913

1014
<ImageButton
1115
android:id="@+id/ibPlayPause"
@@ -15,10 +19,6 @@
1519
android:layout_weight=".25"
1620
android:background="?attr/selectableItemBackgroundBorderless"
1721
android:contentDescription="@string/play_and_stop_button"
18-
android:paddingBottom="@dimen/activity_vertical_margin"
19-
android:paddingLeft="@dimen/activity_horizontal_margin"
20-
android:paddingRight="@dimen/activity_horizontal_margin"
21-
android:paddingTop="@dimen/activity_vertical_margin"
2222
android:src="@drawable/ic_track_play" />
2323

2424
<ImageButton
@@ -29,29 +29,22 @@
2929
android:layout_weight=".25"
3030
android:background="?attr/selectableItemBackgroundBorderless"
3131
android:contentDescription="@string/play_and_stop_button"
32-
android:paddingBottom="@dimen/activity_vertical_margin"
33-
android:paddingLeft="@dimen/activity_horizontal_margin"
34-
android:paddingRight="@dimen/activity_horizontal_margin"
35-
android:paddingTop="@dimen/activity_vertical_margin"
3632
android:src="@drawable/ic_play_next" />
3733

3834
<RelativeLayout
39-
android:layout_width="wrap_content"
35+
android:layout_width="0dp"
4036
android:layout_height="wrap_content"
41-
android:layout_weight="2"
42-
android:gravity="center"
43-
android:paddingBottom="@dimen/activity_vertical_margin"
44-
android:paddingLeft="@dimen/activity_horizontal_margin"
45-
android:paddingRight="@dimen/activity_horizontal_margin"
46-
android:paddingTop="@dimen/activity_vertical_margin">
37+
android:layout_weight="2.25"
38+
android:gravity="center">
4739

4840
<TextView
4941
android:id="@+id/tvPlayingTrackName"
5042
style="@style/TextAppearance.AppCompat.Medium.Inverse"
5143
android:layout_width="wrap_content"
5244
android:layout_height="wrap_content"
5345
android:ellipsize="end"
54-
android:maxLines="1" />
46+
android:maxLines="1"
47+
android:text="Them bullshit brothers in arms" />
5548

5649
<ProgressBar
5750
android:id="@+id/pbTrackPlay"
@@ -67,7 +60,8 @@
6760
android:layout_height="wrap_content"
6861
android:layout_below="@+id/pbTrackPlay"
6962
android:ellipsize="end"
70-
android:maxLines="1" />
63+
android:maxLines="1"
64+
android:text="Laughing Spot Gorillas" />
7165

7266
</RelativeLayout>
7367

@@ -76,12 +70,8 @@
7670
android:layout_width="wrap_content"
7771
android:layout_height="wrap_content"
7872
android:layout_gravity="center"
79-
android:layout_weight=".5"
73+
android:layout_weight=".25"
8074
android:background="?attr/selectableItemBackgroundBorderless"
8175
android:contentDescription="@string/add_to_bucket"
82-
android:paddingBottom="@dimen/activity_vertical_margin"
83-
android:paddingLeft="@dimen/activity_horizontal_margin"
84-
android:paddingRight="@dimen/activity_horizontal_margin"
85-
android:paddingTop="@dimen/activity_vertical_margin"
8676
android:src="@drawable/ic_track_bucket_add" />
8777
</LinearLayout>

‎app/src/main/res/menu/menu_home.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:app="http://schemas.android.com/apk/res-auto"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:context=".ui.MainActivity">
4+
tools:context=".activities.MainActivity">
55
<item
66
android:id="@+id/search"
77
android:icon="@android:drawable/ic_menu_search"

‎app/src/main/res/values-hdpi/dimens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<resources>
2+
<dimen name="ic_size">28.8dp</dimen>
3+
</resources>

‎app/src/main/res/values-xhdpi/dimens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<resources>
2+
<dimen name="ic_size">43.2dp</dimen>
3+
</resources>

‎app/src/main/res/values-xxhdpi/dimens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<resources>
2+
<dimen name="ic_size">57.6dp</dimen>
3+
</resources>

‎app/src/main/res/values-xxxhdpi/dimens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<resources>
2+
<dimen name="ic_size">72.0dp</dimen>
3+
</resources>

‎app/src/main/res/values/dimens.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
<dimen name="activity_vertical_margin">16dp</dimen>
55
<dimen name="fab_margin">16dp</dimen>
66
<dimen name="appbar_padding_top">8dp</dimen>
7+
8+
<dimen name="ic_size">24dp</dimen>
79
</resources>

0 commit comments

Comments
 (0)