ThmmyNoLife
/
mTHMMY
mirror of https://github.com/ThmmyNoLife/mTHMMY
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Code cleanup and fixes

pull/24/head
Apostolos Fanakis 8 years ago
parent
9b6e8da793
commit
70eff69a73
5 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
  2. 4
      app/src/main/java/gr/thmmy/mthmmy/activities/profile/ProfileActivity.java
  3. 6
      app/src/main/res/layout-v21/activity_profile.xml
  4. 31
      app/src/main/res/layout/activity_profile.xml
  5. 1
      app/src/main/res/layout/activity_topic.xml

2
app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
View File

@ -89,7 +89,7 @@ public class MainActivity extends BaseActivity implements RecentFragment.RecentF
@Override @Override
public void onRecentFragmentInteraction(TopicSummary topicSummary) { public void onRecentFragmentInteraction(TopicSummary topicSummary) {
Intent i = new Intent(MainActivity.this, TopicActivity.class); Intent i = new Intent(MainActivity.this, TopicActivity.class);
i.putExtra(EXTRAS_TOPIC_URL, topicSummary.getTopicUrl()); i.putExtra(EXTRAS_TOPIC_URL, "https://www.thmmy.gr/smf/index.php?topic=67565.0");
i.putExtra(EXTRAS_TOPIC_TITLE, topicSummary.getTitle()); i.putExtra(EXTRAS_TOPIC_TITLE, topicSummary.getTitle());
startActivity(i); startActivity(i);
} }

4
app/src/main/java/gr/thmmy/mthmmy/activities/profile/ProfileActivity.java
View File

@ -99,8 +99,8 @@ public class ProfileActivity extends BaseActivity {
userThumbnail = (ImageView) findViewById(R.id.user_thumbnail); userThumbnail = (ImageView) findViewById(R.id.user_thumbnail);
userName = (TextView) findViewById(R.id.profile_act_username); userName = (TextView) findViewById(R.id.profile_act_username);
personalText = (TextView) findViewById(R.id.profile_act_personal_text); personalText = (TextView) findViewById(R.id.profile_activity_personal_text);
mainContent = (LinearLayout) findViewById(R.id.profile_act_content); mainContent = (LinearLayout) findViewById(R.id.profile_activity_content);
replyFAB = (FloatingActionButton) findViewById(R.id.profile_fab); replyFAB = (FloatingActionButton) findViewById(R.id.profile_fab);
replyFAB.setEnabled(false); replyFAB.setEnabled(false);

6
app/src/main/res/layout-v21/activity_profile.xml
View File

@ -17,7 +17,7 @@
android:theme="@style/ToolbarTheme"> android:theme="@style/ToolbarTheme">
<android.support.design.widget.CollapsingToolbarLayout <android.support.design.widget.CollapsingToolbarLayout
android:id="@+id/main.collapsing" android:id="@+id/main_collapsing"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
@ -46,7 +46,7 @@
app:layout_collapseMode="parallax"/> app:layout_collapseMode="parallax"/>
<TextView <TextView
android:id="@+id/profile_act_personal_text" android:id="@+id/profile_activity_personal_text"
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:layout_gravity="center"
@ -97,7 +97,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout <LinearLayout
android:id="@+id/profile_act_content" android:id="@+id/profile_activity_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"

31
app/src/main/res/layout/activity_profile.xml
View File

@ -17,7 +17,7 @@
android:theme="@style/ToolbarTheme"> android:theme="@style/ToolbarTheme">
<android.support.design.widget.CollapsingToolbarLayout <android.support.design.widget.CollapsingToolbarLayout
android:id="@+id/main.collapsing" android:id="@+id/main_collapsing"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
@ -45,7 +45,7 @@
app:layout_collapseMode="parallax"/> app:layout_collapseMode="parallax"/>
<TextView <TextView
android:id="@+id/profile_act_personal_text" android:id="@+id/profile_activity_personal_text"
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:layout_gravity="center"
@ -72,19 +72,8 @@
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/progressBar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="invisible"
app:layout_anchor="@id/appbar"
app:layout_anchorGravity="bottom|center"
app:mpb_indeterminateTint="@color/accent"
app:mpb_progressStyle="horizontal"/>
<android.support.v4.widget.NestedScrollView <android.support.v4.widget.NestedScrollView
android:id="@+id/nested_scroll"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="top|start" android:layout_gravity="top|start"
@ -97,7 +86,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout <LinearLayout
android:id="@+id/profile_act_content" android:id="@+id/profile_activity_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
@ -105,6 +94,18 @@
</LinearLayout> </LinearLayout>
</android.support.v4.widget.NestedScrollView> </android.support.v4.widget.NestedScrollView>
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/progressBar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="invisible"
app:layout_anchor="@id/nested_scroll"
app:layout_anchorGravity="top|center"
app:mpb_indeterminateTint="@color/accent"
app:mpb_progressStyle="horizontal"/>
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/profile_fab" android:id="@+id/profile_fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"

1
app/src/main/res/layout/activity_topic.xml
View File

@ -90,7 +90,6 @@
app:srcCompat="@drawable/page_last"/> app:srcCompat="@drawable/page_last"/>
</android.support.v7.widget.FitWindowsLinearLayout> </android.support.v7.widget.FitWindowsLinearLayout>
<me.zhanghai.android.materialprogressbar.MaterialProgressBar <me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding" style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"

Write Preview
Loading…
Cancel
Save