Skip to content
Snippets Groups Projects
Commit c7292473 authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Make things load properly if they have never been loaded.

parent 131bbaf8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -11,7 +11,7 @@ import android.support.v4.view.GravityCompat;
import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.text.TextUtils;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
Loading
Loading
@@ -86,20 +86,6 @@ public class MainActivity extends BaseActivity {
drawerLayout.openDrawer(GravityCompat.START);
}
});
toolbar.inflateMenu(R.menu.main);
toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch(item.getItemId()) {
case R.id.action_logout:
Prefs.setLoggedIn(MainActivity.this, false);
startActivity(new Intent(MainActivity.this, LoginActivity.class));
return true;
default:
return false;
}
}
});
if(!Prefs.isLoggedIn(this)) {
startActivity(new Intent(this, LoginActivity.class));
Loading
Loading
@@ -274,22 +260,21 @@ public class MainActivity extends BaseActivity {
public void success(List<Project> projects, Response resp) {
Repository.projects = new ArrayList<>(projects);
 
if(Repository.projects.size() != 0) {
if(Prefs.getLastProject(MainActivity.this).length() == 0)
GitLabApp.instance().setSelectedProject(Repository.projects.get(0));
else if(Repository.projects.size() > 0) {
String lastProject = Prefs.getLastProject(MainActivity.this);
if(!projects.isEmpty()) {
String lastProject = Prefs.getLastProject(MainActivity.this);
if(TextUtils.isEmpty(lastProject)){
GitLabApp.instance().setSelectedProject(projects.get(0));
} else {
for(Project p : projects) {
if(p.toString().equals(lastProject)) {
GitLabApp.instance().setSelectedProject(p);
}
}
 
for(Project p : Repository.projects) {
if(p.toString().equals(lastProject)) {
GitLabApp.instance().setSelectedProject(p);
}
}
if(GitLabApp.instance().getSelectedProject() == null) {
GitLabApp.instance().setSelectedProject(Repository.projects.get(0));
}
}
if(GitLabApp.instance().getSelectedProject() == null) {
GitLabApp.instance().setSelectedProject(projects.get(0));
}
}
}
if(GitLabApp.instance().getSelectedProject() != null) {
Loading
Loading
@@ -315,19 +300,20 @@ public class MainActivity extends BaseActivity {
@Override
public void success(List<Branch> branches, Response resp) {
progress.setVisibility(View.GONE);
Repository.branches = new ArrayList<>(branches);
Branch[] spinnerData = new Branch[Repository.branches.size()];
Branch[] spinnerData = new Branch[branches.size()];
int selectedBranchIndex = -1;
for(int i = 0; i < Repository.branches.size(); i++)
{
spinnerData[i] = Repository.branches.get(i);
for(int i = 0; i < branches.size(); i++) {
spinnerData[i] = branches.get(i);
 
if(Prefs.getLastBranch(MainActivity.this).equals(spinnerData[i].getName()))
if(Prefs.getLastBranch(MainActivity.this).equals(spinnerData[i].getName())) {
selectedBranchIndex = i;
else if(selectedBranchIndex == -1 && GitLabApp.instance().getSelectedProject() != null && spinnerData[i].getName().equals(GitLabApp.instance().getSelectedProject().getDefaultBranch()))
}
else if(selectedBranchIndex == -1 && GitLabApp.instance().getSelectedProject() != null && spinnerData[i].getName().equals(GitLabApp.instance().getSelectedProject().getDefaultBranch())) {
selectedBranchIndex = i;
}
}
 
// Set up the dropdown list navigation in the action bar.
Loading
Loading
@@ -337,7 +323,7 @@ public class MainActivity extends BaseActivity {
}
branchSpinner.setOnItemSelectedListener(spinnerItemSelectedListener);
if(Repository.branches.size() == 0) {
if(branches.isEmpty()) {
GitLabApp.instance().setSelectedBranch(null);
loadData();
}
Loading
Loading
Loading
Loading
@@ -11,21 +11,21 @@ import org.parceler.Parcel;
public class FileResponse {
 
@SerializedName("file_name")
private String mFileName;
String mFileName;
@SerializedName("file_path")
private String mFilePath;
String mFilePath;
@SerializedName("size")
private long mSize;
long mSize;
@SerializedName("encoding")
private String mEncoding;
String mEncoding;
@SerializedName("content")
private String mContent;
String mContent;
@SerializedName("ref")
private String mRef;
String mRef;
@SerializedName("blob_id")
private String mBlobId;
String mBlobId;
@SerializedName("commit_id")
private String mCommitId;
String mCommitId;
 
public String getFileName() {
return mFileName;
Loading
Loading
Loading
Loading
@@ -2,7 +2,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_margin="8dp">
 
<LinearLayout
android:layout_width="match_parent"
Loading
Loading
@@ -21,7 +22,7 @@
android:layout_margin="5dp"
android:ems="10"
android:hint="@string/title_hint"
android:inputType="text">
android:inputType="text|textCapWords">
 
<requestFocus />
</EditText>
Loading
Loading
@@ -40,7 +41,7 @@
android:layout_margin="5dp"
android:ems="10"
android:hint="@string/description_hint"
android:inputType="text" />
android:inputType="text|textCapSentences" />
 
</android.support.design.widget.TextInputLayout>
 
Loading
Loading
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_logout"
android:orderInCategory="101"
app:showAsAction="never"
android:title="@string/action_logout"/>
</menu>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment