Skip to content

Commit 9b8db55

Browse files
dipu989jddeep
authored andcommitted
fix : Display message when no files on device.
removed unused imports. fix : Display message when no files on device reformat code. fix : Display message when no files on device fix : Set empty view in logged data activity. fix : Set empty view in logged data activity.
1 parent 7d753d0 commit 9b8db55

File tree

5 files changed

+59
-5
lines changed

5 files changed

+59
-5
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
android:supportsRtl="true"
2424
android:theme="@style/AppTheme"
2525
tools:ignore="AllowBackup">
26-
<activity android:name=".activities.ShareDataActivity" />
26+
<activity android:name=".activities.ShareDataActivity"
27+
android:label="Share"/>
2728
<activity android:name=".activities.RelaxParentActivity" />
2829
<activity android:name=".activities.PinLayoutActivity" />
2930
<activity android:name=".activities.MeditationListActivity" />

app/src/main/java/io/neurolab/activities/DataLoggerActivity.java

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,13 @@ private void showLoggedDataList(File appDir) {
6767
filesList.add(file);
6868
}
6969
DataLoggerListAdapter adapter = new DataLoggerListAdapter(this, filesList, flag);
70+
checkAdapterStateChanged(adapter);
7071
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(
7172
this, LinearLayoutManager.VERTICAL, false);
7273
dataloggerRecyclerView.setLayoutManager(linearLayoutManager);
7374
dataloggerRecyclerView.setAdapter(adapter);
74-
} else {
75-
75+
}
76+
else {
7677
setupPath();
7778
noLoggedView.setVisibility(View.GONE);
7879

@@ -82,13 +83,42 @@ private void showLoggedDataList(File appDir) {
8283
readWriteData("sample4", appDir);
8384

8485
DataLoggerListAdapter adapter = new DataLoggerListAdapter(this, filesList, flag);
86+
checkAdapterStateChanged(adapter);
8587
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(
8688
this, LinearLayoutManager.VERTICAL, false);
8789
dataloggerRecyclerView.setLayoutManager(linearLayoutManager);
8890
dataloggerRecyclerView.setAdapter(adapter);
8991
}
9092
}
9193

94+
public void checkAdapterStateChanged(DataLoggerListAdapter adapter){
95+
adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
96+
97+
@Override
98+
public void onChanged() {
99+
super.onChanged();
100+
checkEmpty();
101+
}
102+
103+
@Override
104+
public void onItemRangeInserted(int positionStart, int itemCount) {
105+
super.onItemRangeInserted(positionStart, itemCount);
106+
checkEmpty();
107+
}
108+
109+
@Override
110+
public void onItemRangeRemoved(int positionStart, int itemCount) {
111+
super.onItemRangeRemoved(positionStart, itemCount);
112+
checkEmpty();
113+
}
114+
115+
void checkEmpty() {
116+
noLoggedView.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
117+
}
118+
});
119+
120+
}
121+
92122
@Override
93123
public boolean onCreateOptionsMenu(Menu menu) {
94124
getMenuInflater().inflate(R.menu.share_menu, menu);

app/src/main/java/io/neurolab/activities/ShareDataActivity.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
import android.view.View;
1515
import android.widget.AdapterView;
1616
import android.widget.ArrayAdapter;
17+
import android.widget.Button;
1718
import android.widget.ListView;
19+
import android.widget.TextView;
1820
import android.widget.Toast;
1921
import java.io.File;
2022
import java.util.ArrayList;
@@ -39,16 +41,19 @@ public class ShareDataActivity extends AppCompatActivity {
3941
private static ArrayList<Uri> selectedUri = new ArrayList<Uri>();
4042
private static Set<Uri> set;
4143
private static SparseBooleanArray sparseBooleanArray;
44+
private static TextView numberOfFiles;
45+
private static Button shareButton;
4246

4347
@Override
4448
protected void onCreate(Bundle savedInstanceState) {
4549
super.onCreate(savedInstanceState);
4650
setContentView(R.layout.activity_share_data);
4751
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
4852

49-
Toast.makeText(this, R.string.share_screen_toast, Toast.LENGTH_SHORT).show();
5053

5154
fileListView = findViewById(R.id.fileListView);
55+
shareButton = findViewById(R.id.share_btn);
56+
numberOfFiles = findViewById(R.id.fileNumberView);
5257
context = getApplicationContext();
5358

5459
resultIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
@@ -70,6 +75,14 @@ protected void onCreate(Bundle savedInstanceState) {
7075
newFileName[i] = files[i].getName();
7176
j++;
7277
}
78+
numberOfFiles.setVisibility(View.INVISIBLE);
79+
Toast.makeText(this, R.string.share_screen_toast, Toast.LENGTH_SHORT).show();
80+
}
81+
82+
if (appDir.listFiles().length == 0) {
83+
numberOfFiles.setVisibility(View.VISIBLE);
84+
numberOfFiles.setText(R.string.no_datasets_message);
85+
shareButton.setVisibility(View.INVISIBLE);
7386
}
7487

7588
final List<String> file_list = new ArrayList<String>(Arrays.asList(newFileName));

app/src/main/res/layout/activity_share_data.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,18 @@
3434
android:layout_width="match_parent"
3535
android:layout_height="wrap_content"
3636
android:layout_above="@+id/linear_layout"
37+
android:layout_below="@+id/fileNumberView"
3738
android:layout_alignParentStart="true"
38-
android:layout_alignParentTop="true"
3939
android:layout_marginTop="@dimen/layout_margin_medium"
4040
android:layout_marginBottom="@dimen/layout_margin_medium" />
4141

42+
<TextView
43+
android:id="@+id/fileNumberView"
44+
android:layout_width="match_parent"
45+
android:layout_height="wrap_content"
46+
android:layout_alignParentTop="true"
47+
android:layout_marginTop="@dimen/layout_margin_medium"
48+
android:textAlignment="center"
49+
android:textSize="@dimen/text_size_larger" />
50+
4251
</RelativeLayout>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ A difference to existing projects like OpenBCI is that it will not be necessary
174174
<string name="meditation">Meditate</string>
175175
<string name="meditation_desc">to (cause someone to) become less active and more calm and happy</string>
176176
<string name="title_activity_share">ShareActivity</string>
177+
<string name="no_datasets_message">No files to show</string>
177178
<string name="enable">Enable</string>
178179
<string name="received_data_display">received data display</string>
179180
<string name="send">Send</string>

0 commit comments

Comments
 (0)