Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 02:07:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix code spacing

Browse source
This commit is contained in:
Gabriel Calero 2018-04-18 16:44:49 -03:00
parent e3b94b163c
commit 472cc1b29a
8 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/src/main/assets/hifi_domains.json
View file

@ -1,7 +1,7 @@
{ {
"hifi_domains" : [ "hifi_domains" : [
{ {
"name": "You last location", "name": "Your last location",
"url": "", "url": "",
"thumbnail": "" "thumbnail": ""
}, },

2
android/app/src/main/java/io/highfidelity/hifiinterface/GotoActivity.java
View file

@ -67,7 +67,7 @@ public class GotoActivity extends AppCompatActivity {
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
return; return;
} }
if (uri.getScheme()==null || uri.getScheme().isEmpty()) { if (uri.getScheme() == null || uri.getScheme().isEmpty()) {
urlString = "hifi://" + urlString; urlString = "hifi://" + urlString;
} }

10
android/app/src/main/java/io/highfidelity/hifiinterface/HomeActivity.java
View file

@ -56,7 +56,7 @@ public class HomeActivity extends AppCompatActivity implements NavigationView.On
mNavigationView = (NavigationView) findViewById(R.id.nav_view); mNavigationView = (NavigationView) findViewById(R.id.nav_view);
mNavigationView.setNavigationItemSelectedListener(this); mNavigationView.setNavigationItemSelectedListener(this);
TabHost tabs=(TabHost)findViewById(R.id.tabhost); TabHost tabs = (TabHost)findViewById(R.id.tabhost);
tabs.setup(); tabs.setup();
TabHost.TabSpec spec=tabs.newTabSpec("featured"); TabHost.TabSpec spec=tabs.newTabSpec("featured");
@ -64,12 +64,12 @@ public class HomeActivity extends AppCompatActivity implements NavigationView.On
spec.setIndicator(getString(R.string.featured)); spec.setIndicator(getString(R.string.featured));
tabs.addTab(spec); tabs.addTab(spec);
spec=tabs.newTabSpec("popular"); spec = tabs.newTabSpec("popular");
spec.setContent(R.id.popular); spec.setContent(R.id.popular);
spec.setIndicator(getString(R.string.popular)); spec.setIndicator(getString(R.string.popular));
tabs.addTab(spec); tabs.addTab(spec);
spec=tabs.newTabSpec("bookmarks"); spec = tabs.newTabSpec("bookmarks");
spec.setContent(R.id.bookmarks); spec.setContent(R.id.bookmarks);
spec.setIndicator(getString(R.string.bookmarks)); spec.setIndicator(getString(R.string.bookmarks));
tabs.addTab(spec); tabs.addTab(spec);
@ -77,7 +77,7 @@ public class HomeActivity extends AppCompatActivity implements NavigationView.On
tabs.setCurrentTab(0); tabs.setCurrentTab(0);
TabWidget tabwidget=tabs.getTabWidget(); TabWidget tabwidget=tabs.getTabWidget();
for(int i=0;i<tabwidget.getChildCount();i++){ for(int i=0; i<tabwidget.getChildCount(); i++){
TextView tv=(TextView) tabwidget.getChildAt(i).findViewById(android.R.id.title); TextView tv=(TextView) tabwidget.getChildAt(i).findViewById(android.R.id.title);
tv.setTextAppearance(R.style.TabText); tv.setTextAppearance(R.style.TabText);
} }
@ -100,7 +100,7 @@ public class HomeActivity extends AppCompatActivity implements NavigationView.On
SearchView searchView = findViewById(R.id.searchView); SearchView searchView = findViewById(R.id.searchView);
int searchPlateId = searchView.getContext().getResources().getIdentifier("android:id/search_plate", null, null); int searchPlateId = searchView.getContext().getResources().getIdentifier("android:id/search_plate", null, null);
View searchPlate = searchView.findViewById(searchPlateId); View searchPlate = searchView.findViewById(searchPlateId);
if (searchPlate!=null) { if (searchPlate != null) {
searchPlate.setBackgroundColor (Color.TRANSPARENT); searchPlate.setBackgroundColor (Color.TRANSPARENT);
int searchTextId = searchPlate.getContext ().getResources ().getIdentifier ("android:id/search_src_text", null, null); int searchTextId = searchPlate.getContext ().getResources ().getIdentifier ("android:id/search_src_text", null, null);
TextView searchTextView = searchView.findViewById(searchTextId); TextView searchTextView = searchView.findViewById(searchTextId);

2
android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
View file

@ -65,7 +65,7 @@ public class InterfaceActivity extends QtActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
Intent intent = getIntent(); Intent intent = getIntent();
if (intent.hasExtra(DOMAIN_URL) && !intent.getStringExtra(DOMAIN_URL).isEmpty()) { if (intent.hasExtra(DOMAIN_URL) && !intent.getStringExtra(DOMAIN_URL).isEmpty()) {
intent.putExtra("applicationArguments", "--url "+intent.getStringExtra(DOMAIN_URL)); intent.putExtra("applicationArguments", "--url " + intent.getStringExtra(DOMAIN_URL));
} }
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

1
interface/src/java/io/highfidelity/interface/InterfaceActivity.java
View file

@ -15,7 +15,6 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.view.WindowManager; import android.view.WindowManager;
import android.util.Log;
import org.qtproject.qt5.android.bindings.QtActivity; import org.qtproject.qt5.android.bindings.QtActivity;
public class InterfaceActivity extends QtActivity { public class InterfaceActivity extends QtActivity {

2
scripts/system/+android/actionbar.js
View file

@ -42,7 +42,7 @@ function onBackPressed() {
} }
Script.scriptEnding.connect(function () { Script.scriptEnding.connect(function() {
if(backButton) { if(backButton) {
backButton.clicked.disconnect(onBackPressed); backButton.clicked.disconnect(onBackPressed);
} }

4
scripts/system/+android/bottombar.js
View file

@ -248,12 +248,12 @@ function handleLogin() {
function onUsernameChanged(username) { function onUsernameChanged(username) {
if (Account.isLoggedIn()) { if (Account.isLoggedIn()) {
MyAvatar.displayName=username; MyAvatar.displayName = username;
} }
} }
function handleLogout() { function handleLogout() {
MyAvatar.displayName=""; MyAvatar.displayName = "";
if (loginBtn) { if (loginBtn) {
loginBtn.editProperties({text: "LOG IN"}); loginBtn.editProperties({text: "LOG IN"});
} }

2
scripts/system/+android/modes.js
View file

@ -39,7 +39,7 @@ function init() {
radar.setUniqueColor(uniqueColor); radar.setUniqueColor(uniqueColor);
radar.init(); radar.init();
barQml = new QmlFragment({ barQml = new QmlFragment({
qml: "hifi/modesbar.qml" qml: "hifi/modesbar.qml"
}); });
modeButton = barQml.addButton({ modeButton = barQml.addButton({