bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix order

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-02-23 23:21:06 +03:00
commit aabff79a1e
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -36,7 +36,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.github.axet.androidlibrary.animations.RemoveItemAnimation;
import com.github.axet.androidlibrary.app.LibraryApplication;
import com.github.axet.androidlibrary.app.MainLibrary;
import com.github.axet.androidlibrary.widgets.OpenFileDialog;
import com.github.axet.androidlibrary.widgets.PopupShareActionProvider;
import com.github.axet.audiorecorder.R;
@ -180,10 +180,10 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
time.setText(s.format(new Date(f.lastModified())));
TextView dur = (TextView) convertView.findViewById(R.id.recording_duration);
dur.setText(LibraryApplication.formatDuration(getContext(), durations.get(f)));
dur.setText(MainLibrary.formatDuration(getContext(), durations.get(f)));
TextView size = (TextView) convertView.findViewById(R.id.recording_size);
size.setText(LibraryApplication.formatSize(getContext(), f.length()));
size.setText(MainLibrary.formatSize(getContext(), f.length()));
final View playerBase = convertView.findViewById(R.id.recording_player);
playerBase.setOnClickListener(new View.OnClickListener() {
@ -448,11 +448,11 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
}
});
start.setText(LibraryApplication.formatDuration(getContext(), c));
start.setText(MainLibrary.formatDuration(getContext(), c));
bar.setMax(d);
bar.setKeyProgressIncrement(1);
bar.setProgress(c);
end.setText("-" + LibraryApplication.formatDuration(getContext(), d - c));
end.setText("-" + MainLibrary.formatDuration(getContext(), d - c));
return playing;
}

4
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -35,7 +35,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.github.axet.androidlibrary.animations.MarginBottomAnimation;
import com.github.axet.androidlibrary.app.LibraryApplication;
import com.github.axet.androidlibrary.app.MainLibrary;
import com.github.axet.audiorecorder.R;
import com.github.axet.audiorecorder.app.MainApplication;
import com.github.axet.audiorecorder.app.RawSamples;
@ -717,7 +717,7 @@ public class RecordingActivity extends AppCompatActivity {
void updateSamples(long samplesTime) {
long ms = samplesTime / sampleRate * 1000;
time.setText(LibraryApplication.formatDuration(this, ms));
time.setText(MainLibrary.formatDuration(this, ms));
}
@Override

4
app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java
View file

@ -6,7 +6,7 @@ import android.content.SharedPreferences;
import android.media.AudioFormat;
import android.preference.PreferenceManager;
import com.github.axet.androidlibrary.app.LibraryApplication;
import com.github.axet.androidlibrary.app.MainLibrary;
import com.github.axet.androidlibrary.widgets.ThemeUtils;
import com.github.axet.audiorecorder.R;
@ -70,7 +70,7 @@ public class MainApplication extends Application {
str = getResources().getQuantityString(R.plurals.seconds, diffSeconds, diffSeconds);
}
return getString(R.string.title_header, LibraryApplication.formatSize(this, free), str);
return getString(R.string.title_header, MainLibrary.formatSize(this, free), str);
}
public static int getChannels(Context context) {