greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Stefan Schueller 2019-03-03 15:45:13 +01:00
commit 94deb4d5c3
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
View File

@ -228,6 +228,15 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
}
return false;
}
@Override
public void onResume() {
setPreferenceScreen(null);
addPreferencesFromResource(R.xml.pref_general);
bindPreferenceSummaryToValue(findPreference("pref_api_base"));
super.onResume();
}
}
}

12
app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
View File

@ -128,8 +128,8 @@ public class VideoListActivity extends CommonActivity {
menu.findItem(R.id.action_account).setIcon(
new IconicsDrawable(this, FontAwesome.Icon.faw_user_circle).actionBar());
menu.findItem(R.id.action_server_selection).setIcon(
new IconicsDrawable(this, FontAwesome.Icon.faw_server).actionBar());
// menu.findItem(R.id.action_server_selection).setIcon(
// new IconicsDrawable(this, FontAwesome.Icon.faw_server).actionBar());
MenuItem searchMenuItem = menu.findItem(R.id.action_search);
@ -203,10 +203,10 @@ public class VideoListActivity extends CommonActivity {
this.startActivity(intentMe);
}
return false;
case R.id.action_server_selection:
Intent intentServer = new Intent(this, SelectServerActivity.class);
this.startActivity(intentServer);
return false;
// case R.id.action_server_selection:
// Intent intentServer = new Intent(this, SelectServerActivity.class);
// this.startActivity(intentServer);
// return false;
default:
break;
}

12
app/src/main/res/menu/menu_top_videolist.xml
View File

@ -26,11 +26,11 @@
android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_server_selection"
android:orderInCategory="300"
android:title="@string/action_bar_title_server_selection"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
app:showAsAction="ifRoom" />
<!--<item-->
<!--android:id="@+id/action_server_selection"-->
<!--android:orderInCategory="300"-->
<!--android:title="@string/action_bar_title_server_selection"-->
<!--android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"-->
<!--app:showAsAction="ifRoom" />-->
</menu>