nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 19:31:30 +00:00
Code Releases Activity

Removed RelativeLayouts from web gui layout.

Browse source 
Also made loading spinners consistently sized.
This commit is contained in:
George Venios 2015-09-03 01:52:51 +03:00 committed by George Venios
parent 8e04ce3afa
commit dcd3688a8e
3 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java
View file

@ -13,7 +13,6 @@ import android.webkit.HttpAuthHandler;
import android.webkit.SslErrorHandler; import android.webkit.SslErrorHandler;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
import android.widget.ProgressBar;
import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.R;
import com.nutomic.syncthingandroid.syncthing.SyncthingService; import com.nutomic.syncthingandroid.syncthing.SyncthingService;
@ -108,9 +107,6 @@ public class WebGuiActivity extends SyncthingActivity
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mLoadingView = findViewById(R.id.loading); mLoadingView = findViewById(R.id.loading);
ProgressBar pb = (ProgressBar) mLoadingView.findViewById(R.id.progress);
pb.setIndeterminate(true);
loadCaCert(); loadCaCert();
mWebView = (WebView) findViewById(R.id.webview); mWebView = (WebView) findViewById(R.id.webview);

21
src/main/res/layout/activity_web_gui.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -10,27 +10,24 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" /> android:visibility="gone" />
<RelativeLayout <LinearLayout
android:id="@+id/loading" android:id="@+id/loading"
android:layout_centerInParent="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical">
<ProgressBar <ProgressBar
android:id="@+id/progress" android:id="@+id/progress"
android:layout_centerInParent="true"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dip" /> android:layout_marginBottom="8dp" />
<TextView <TextView
android:id="@+id/loading_text" android:id="@+id/loading_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/progress"
android:text="@string/web_gui_loading" /> android:text="@string/web_gui_loading" />
</LinearLayout>
</RelativeLayout> </FrameLayout>
</RelativeLayout>

1
src/main/res/layout/dialog_loading.xml
View file

@ -6,7 +6,6 @@
android:gravity="center"> android:gravity="center">
<ProgressBar <ProgressBar
style="?android:attr/progressBarStyle"
android:id="@+id/progress" android:id="@+id/progress"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"